January 2014 - Wine-commits

Hans Leidekker : advapi32/tests: Add a test to show that OpenSCManager clears last error on success.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 6cd1076f61e9264bf19cb551f7a776b63da7bb44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd1076f61e9264bf19cb551f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 28 13:24:14 2014 +0100 advapi32/tests: Add a test to show that OpenSCManager clears last error on success. --- dlls/advapi32/tests/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index fac6bd9..74cb9a8 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -101,7 +101,6 @@ static void test_open_scm(void) CloseServiceHandle(scm_handle); /* Just in case */ /* Proper call with an empty hostname */ - SetLastError(0xdeadbeef); scm_handle = OpenSCManagerA("", SERVICES_ACTIVE_DATABASEA, SC_MANAGER_CONNECT); ok(scm_handle != NULL, "Expected success, got error %u\n", GetLastError()); CloseServiceHandle(scm_handle); @@ -109,6 +108,7 @@ static void test_open_scm(void) /* Again a correct one */ SetLastError(0xdeadbeef); scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", GetLastError()); ok(scm_handle != NULL, "Expected success, got error %u\n", GetLastError()); CloseServiceHandle(scm_handle); }

1 0

Hans Leidekker : dwmapi: Silence a fixme.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 7d696911b2496eba4a84c0ab2334219926adf3fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d696911b2496eba4a84c0ab2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 28 13:24:47 2014 +0100 dwmapi: Silence a fixme. --- dlls/dwmapi/dwmapi_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index e6154ba..8cc46f0 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -112,7 +112,9 @@ HRESULT WINAPI DwmFlush(void) */ HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attribute, DWORD size) { - FIXME("(%p, %x, %p, %x) stub\n", hwnd, attributenum, attribute, size); + static BOOL once; + + if (!once++) FIXME("(%p, %x, %p, %x) stub\n", hwnd, attributenum, attribute, size); return E_NOTIMPL; }

1 0

Hans Leidekker : winhttp/tests: Fix a test that fails on Windows.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 0e9f46d0749d7309ca42d7f5691a3ea64cc8c230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e9f46d0749d7309ca42d7f56… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 28 13:25:23 2014 +0100 winhttp/tests: Fix a test that fails on Windows. --- dlls/winhttp/tests/winhttp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 255eb09..74ec60d 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -292,7 +292,7 @@ static void test_SendRequest (void) static const WCHAR test_file[] = {'/','p','o','s','t','t','e','s','t','.','p','h','p',0}; static const WCHAR test_verb[] = {'P','O','S','T',0}; static CHAR post_data[] = "mode=Test"; - static const char test_post[] = "mode => Test\\0\n"; + static const char test_post[] = "mode => Test\0\n"; header_len = -1L; total_len = optional_len = sizeof(post_data); @@ -349,8 +349,8 @@ static void test_SendRequest (void) ret = WinHttpReadData(request, buffer, sizeof(buffer) - 1, &bytes_rw); ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); - ok(bytes_rw == strlen(test_post), "Read %u bytes instead of %d.\n", bytes_rw, lstrlenA(test_post)); - ok(strncmp(buffer, test_post, bytes_rw) == 0, "Data read did not match, got '%s'.\n", buffer); + ok(bytes_rw == sizeof(test_post) - 1, "Read %u bytes\n", bytes_rw); + ok(!memcmp(buffer, test_post, sizeof(test_post) - 1), "Data read did not match.\n"); ret = WinHttpCloseHandle(request); ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret);

1 0

Piotr Caban : msvcrt: Flush standard streams in flushall function.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 6f4a1817099f861e06aa24a59215b361ebf6b79c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4a1817099f861e06aa24a59… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 28 10:08:32 2014 +0100 msvcrt: Flush standard streams in flushall function. --- dlls/msvcrt/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 908ba26..a78076c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -860,7 +860,7 @@ static int msvcrt_flush_all_buffers(int mask) MSVCRT_FILE *file; LOCK_FILES(); - for (i = 3; i < MSVCRT_stream_idx; i++) { + for (i = 0; i < MSVCRT_stream_idx; i++) { file = msvcrt_get_file(i); if (file->_flag)

1 0

Piotr Caban : msvcrt: Don' t close handles returned by GetStdHandle function.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 5e3cadf8342e2f008ca084188be94b4ab1f1f394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3cadf8342e2f008ca084188… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 28 10:08:47 2014 +0100 msvcrt: Don't close handles returned by GetStdHandle function. --- dlls/msvcrt/file.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index a78076c..80482e1 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1066,14 +1066,8 @@ void msvcrt_free_io(void) unsigned int i; int j; + MSVCRT__flushall(); MSVCRT__fcloseall(); - /* The Win32 _fcloseall() function explicitly doesn't close stdin, - * stdout, and stderr (unlike GNU), so we need to fclose() them here - * or they won't get flushed. - */ - MSVCRT_fclose(&MSVCRT__iob[0]); - MSVCRT_fclose(&MSVCRT__iob[1]); - MSVCRT_fclose(&MSVCRT__iob[2]); for(i=0; i<sizeof(MSVCRT___pioinfo)/sizeof(MSVCRT___pioinfo[0]); i++) MSVCRT_free(MSVCRT___pioinfo[i]);

1 0

Henri Verbeet : d3d10/tests: Also try a WARP device in create_device().
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: ce49a4ae63c6a3f6f9ec790ca19037e54695de49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce49a4ae63c6a3f6f9ec790ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 28 10:09:22 2014 +0100 d3d10/tests: Also try a WARP device in create_device(). --- dlls/d3d10/tests/device.c | 5 ++--- dlls/d3d10/tests/effect.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index 0d5e0b3..8df4150 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -27,12 +27,11 @@ static ID3D10Device *create_device(void) if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) return device; - - trace("Failed to create a HW device, trying REF\n"); + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) return device; - trace("Failed to create a device, returning NULL\n"); return NULL; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index a07bc6c..c75e59f 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -29,12 +29,11 @@ static ID3D10Device *create_device(void) if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) return device; - - trace("Failed to create a HW device, trying REF\n"); + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) return device; - trace("Failed to create a device, returning NULL\n"); return NULL; }

1 0

Henri Verbeet : d3d10/tests: Don't reuse the device.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 127e9bc46b502258f51f39e111d542c74c7f479b URL: http://source.winehq.org/git/wine.git/?a=commit;h=127e9bc46b502258f51f39e11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 28 10:09:23 2014 +0100 d3d10/tests: Don't reuse the device. --- dlls/d3d10/tests/effect.c | 163 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 130 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=127e9bc46b502258f51f3…

1 0

Henri Verbeet : dxgi: Store IWineDXGIAdapter pointers in the factory.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: e9f9c15016c4650a00c74916fbcaa5d1c7141d23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f9c15016c4650a00c74916f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 28 10:09:24 2014 +0100 dxgi: Store IWineDXGIAdapter pointers in the factory. --- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/factory.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 1ae997c..20401c7 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -82,7 +82,7 @@ struct dxgi_factory LONG refcount; struct wined3d *wined3d; UINT adapter_count; - IDXGIAdapter **adapters; + IWineDXGIAdapter **adapters; }; HRESULT dxgi_factory_init(struct dxgi_factory *factory) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 72927c5..e0aa035 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -74,7 +74,7 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IWineDXGIFactory *iface) for (i = 0; i < This->adapter_count; ++i) { - IDXGIAdapter_Release(This->adapters[i]); + IWineDXGIAdapter_Release(This->adapters[i]); } HeapFree(GetProcessHeap(), 0, This->adapters); @@ -139,7 +139,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *ifa return DXGI_ERROR_NOT_FOUND; } - *adapter = This->adapters[adapter_idx]; + *adapter = (IDXGIAdapter *)This->adapters[adapter_idx]; IDXGIAdapter_AddRef(*adapter); TRACE("Returning adapter %p\n", *adapter); @@ -335,7 +335,7 @@ HRESULT dxgi_factory_init(struct dxgi_factory *factory) for (j = 0; j < i; ++j) { - IDXGIAdapter_Release(factory->adapters[j]); + IWineDXGIAdapter_Release(factory->adapters[j]); } hr = E_OUTOFMEMORY; goto fail; @@ -351,12 +351,12 @@ HRESULT dxgi_factory_init(struct dxgi_factory *factory) HeapFree(GetProcessHeap(), 0, adapter); for (j = 0; j < i; ++j) { - IDXGIAdapter_Release(factory->adapters[j]); + IWineDXGIAdapter_Release(factory->adapters[j]); } goto fail; } - factory->adapters[i] = (IDXGIAdapter *)adapter; + factory->adapters[i] = &adapter->IWineDXGIAdapter_iface; } return S_OK;

1 0

Henri Verbeet : dxgi: Implement IDXGIAdapter1.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: ac84e9b726873687c1efb3a08ea6ed9395a8e920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac84e9b726873687c1efb3a08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 28 10:09:25 2014 +0100 dxgi: Implement IDXGIAdapter1. --- dlls/dxgi/adapter.c | 64 ++++++++++++++++++++++++++++++--------------- dlls/dxgi/tests/device.c | 29 ++++++++++++++++++++ include/wine/winedxgi.idl | 2 +- 3 files changed, 73 insertions(+), 22 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 87d886b..d18db85 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -38,6 +38,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IWineDXGIAdapter *i if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDXGIObject) || IsEqualGUID(riid, &IID_IDXGIAdapter) + || IsEqualGUID(riid, &IID_IDXGIAdapter1) || IsEqualGUID(riid, &IID_IWineDXGIAdapter)) { IUnknown_AddRef(iface); @@ -135,9 +136,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc1(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC1 *desc) { - struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface); + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); struct wined3d_adapter_identifier adapter_id; char description[128]; struct wined3d *wined3d; @@ -145,38 +146,57 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, D TRACE("iface %p, desc %p.\n", iface, desc); - if (!desc) return E_INVALIDARG; + if (!desc) + return E_INVALIDARG; - wined3d = IWineDXGIFactory_get_wined3d(This->parent); + wined3d = IWineDXGIFactory_get_wined3d(adapter->parent); adapter_id.driver_size = 0; adapter_id.description = description; adapter_id.description_size = sizeof(description); adapter_id.device_name_size = 0; EnterCriticalSection(&dxgi_cs); - hr = wined3d_get_adapter_identifier(wined3d, This->ordinal, 0, &adapter_id); + hr = wined3d_get_adapter_identifier(wined3d, adapter->ordinal, 0, &adapter_id); wined3d_decref(wined3d); LeaveCriticalSection(&dxgi_cs); - if (SUCCEEDED(hr)) + if (FAILED(hr)) + return hr; + + if (!MultiByteToWideChar(CP_ACP, 0, description, -1, desc->Description, 128)) { - if (!MultiByteToWideChar(CP_ACP, 0, description, -1, desc->Description, 128)) - { - DWORD err = GetLastError(); - ERR("Failed to translate description %s (%#x).\n", debugstr_a(description), err); - hr = E_FAIL; - } - - desc->VendorId = adapter_id.vendor_id; - desc->DeviceId = adapter_id.device_id; - desc->SubSysId = adapter_id.subsystem_id; - desc->Revision = adapter_id.revision; - desc->DedicatedVideoMemory = adapter_id.video_memory; - desc->DedicatedSystemMemory = 0; /* FIXME */ - desc->SharedSystemMemory = 0; /* FIXME */ - memcpy(&desc->AdapterLuid, &adapter_id.adapter_luid, sizeof(desc->AdapterLuid)); + DWORD err = GetLastError(); + ERR("Failed to translate description %s (%#x).\n", debugstr_a(description), err); + hr = E_FAIL; } + desc->VendorId = adapter_id.vendor_id; + desc->DeviceId = adapter_id.device_id; + desc->SubSysId = adapter_id.subsystem_id; + desc->Revision = adapter_id.revision; + desc->DedicatedVideoMemory = adapter_id.video_memory; + desc->DedicatedSystemMemory = 0; /* FIXME */ + desc->SharedSystemMemory = 0; /* FIXME */ + memcpy(&desc->AdapterLuid, &adapter_id.adapter_luid, sizeof(desc->AdapterLuid)); + desc->Flags = 0; + + return hr; +} + +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) +{ + DXGI_ADAPTER_DESC1 desc1; + HRESULT hr; + + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + return E_INVALIDARG; + + if (FAILED(hr = dxgi_adapter_GetDesc1(iface, &desc1))) + return hr; + memcpy(desc, &desc1, sizeof(*desc)); + return hr; } @@ -214,6 +234,8 @@ static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = dxgi_adapter_EnumOutputs, dxgi_adapter_GetDesc, dxgi_adapter_CheckInterfaceSupport, + /* IDXGIAdapter1 methods */ + dxgi_adapter_GetDesc1, /* IWineDXGIAdapter methods */ dxgi_adapter_get_ordinal, }; diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 9be59db..b8e7b33 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -101,6 +101,8 @@ static void test_device_interfaces(IDXGIDevice *device) static void test_adapter_desc(IDXGIDevice *device) { + DXGI_ADAPTER_DESC1 desc1; + IDXGIAdapter1 *adapter1; DXGI_ADAPTER_DESC desc; IDXGIAdapter *adapter; HRESULT hr; @@ -126,6 +128,33 @@ static void test_adapter_desc(IDXGIDevice *device) desc.SharedSystemMemory, desc.SharedSystemMemory / (1024 * 1024)); trace("LUID: %08x:%08x.\n", desc.AdapterLuid.HighPart, desc.AdapterLuid.LowPart); + hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter1, (void **)&adapter1); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + if (hr == E_NOINTERFACE) + goto done; + + hr = IDXGIAdapter1_GetDesc1(adapter1, &desc1); + ok(SUCCEEDED(hr), "GetDesc1 failed, hr %#x.\n", hr); + + ok(!lstrcmpW(desc.Description, desc1.Description), + "Got unexpected description %s.\n", wine_dbgstr_w(desc1.Description)); + ok(desc1.VendorId == desc.VendorId, "Got unexpected vendor ID %04x.\n", desc1.VendorId); + ok(desc1.DeviceId == desc.DeviceId, "Got unexpected device ID %04x.\n", desc1.DeviceId); + ok(desc1.SubSysId == desc.SubSysId, "Got unexpected sub system ID %04x.\n", desc1.SubSysId); + ok(desc1.Revision == desc.Revision, "Got unexpected revision %02x.\n", desc1.Revision); + ok(desc1.DedicatedVideoMemory == desc.DedicatedVideoMemory, + "Got unexpected dedicated video memory %lu.\n", desc1.DedicatedVideoMemory); + ok(desc1.DedicatedSystemMemory == desc.DedicatedSystemMemory, + "Got unexpected dedicated system memory %lu.\n", desc1.DedicatedSystemMemory); + ok(desc1.SharedSystemMemory == desc.SharedSystemMemory, + "Got unexpected shared system memory %lu.\n", desc1.SharedSystemMemory); + ok(!memcmp(&desc.AdapterLuid, &desc1.AdapterLuid, sizeof(desc.AdapterLuid)), + "Got unexpected adapter LUID %08x:%08x.\n", desc1.AdapterLuid.HighPart, desc1.AdapterLuid.LowPart); + trace("Flags: %08x.\n", desc1.Flags); + + IDXGIAdapter1_Release(adapter1); + +done: IDXGIAdapter_Release(adapter); } diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 363030a..a3baece 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -33,7 +33,7 @@ interface IWineDXGIFactory : IDXGIFactory local, uuid(ab1de34c-2963-4ffd-8493-40f580e510e5) ] -interface IWineDXGIAdapter : IDXGIAdapter +interface IWineDXGIAdapter : IDXGIAdapter1 { UINT get_ordinal(); }

1 0

Henri Verbeet : dxgi: Implement IDXGIFactory1.
by Alexandre Julliard 28 Jan '14

28 Jan '14

Module: wine Branch: master Commit: 3d28b01916cf83461ee36325bb555b3f0771e792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d28b01916cf83461ee36325b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 28 10:09:26 2014 +0100 dxgi: Implement IDXGIFactory1. --- dlls/dxgi/factory.c | 34 +++++++++++++++++++++++++++------- include/wine/winedxgi.idl | 2 +- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index e0aa035..18a9a81 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -38,6 +38,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IWineDXGIFactory *i if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDXGIObject) || IsEqualGUID(riid, &IID_IDXGIFactory) + || IsEqualGUID(riid, &IID_IDXGIFactory1) || IsEqualGUID(riid, &IID_IWineDXGIFactory)) { IUnknown_AddRef(iface); @@ -124,29 +125,38 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_GetParent(IWineDXGIFactory *iface, /* IDXGIFactory methods */ -static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *iface, - UINT adapter_idx, IDXGIAdapter **adapter) +static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters1(IWineDXGIFactory *iface, + UINT adapter_idx, IDXGIAdapter1 **adapter) { - struct dxgi_factory *This = impl_from_IWineDXGIFactory(iface); + struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface); TRACE("iface %p, adapter_idx %u, adapter %p\n", iface, adapter_idx, adapter); - if (!adapter) return DXGI_ERROR_INVALID_CALL; + if (!adapter) + return DXGI_ERROR_INVALID_CALL; - if (adapter_idx >= This->adapter_count) + if (adapter_idx >= factory->adapter_count) { *adapter = NULL; return DXGI_ERROR_NOT_FOUND; } - *adapter = (IDXGIAdapter *)This->adapters[adapter_idx]; - IDXGIAdapter_AddRef(*adapter); + *adapter = (IDXGIAdapter1 *)factory->adapters[adapter_idx]; + IDXGIAdapter1_AddRef(*adapter); TRACE("Returning adapter %p\n", *adapter); return S_OK; } +static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *iface, + UINT adapter_idx, IDXGIAdapter **adapter) +{ + TRACE("iface %p, adapter_idx %u, adapter %p\n", iface, adapter_idx, adapter); + + return dxgi_factory_EnumAdapters1(iface, adapter_idx, (IDXGIAdapter1 **)adapter); +} + static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IWineDXGIFactory *iface, HWND window, UINT flags) { FIXME("iface %p, window %p, flags %#x stub!\n\n", iface, window, flags); @@ -263,6 +273,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IWineDXGIFac return E_NOTIMPL; } +static BOOL STDMETHODCALLTYPE dxgi_factory_IsCurrent(IWineDXGIFactory *iface) +{ + FIXME("iface %p stub!\n", iface); + + return TRUE; +} + /* IWineDXGIFactory methods */ static struct wined3d * STDMETHODCALLTYPE dxgi_factory_get_wined3d(IWineDXGIFactory *iface) @@ -294,6 +311,9 @@ static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = dxgi_factory_GetWindowAssociation, dxgi_factory_CreateSwapChain, dxgi_factory_CreateSoftwareAdapter, + /* IDXGIFactory1 methods */ + dxgi_factory_EnumAdapters1, + dxgi_factory_IsCurrent, /* IWineDXGIFactory methods */ dxgi_factory_get_wined3d, }; diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index a3baece..26f29e3 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -23,7 +23,7 @@ import "dxgi.idl"; local, uuid(a07ad9ab-fb01-4574-8bfb-0a70a7373f04) ] -interface IWineDXGIFactory : IDXGIFactory +interface IWineDXGIFactory : IDXGIFactory1 { struct wined3d *get_wined3d(); }

1 0