February 2014 - Wine-commits

Dmitry Timoshkov : advapi32/tests: Correct the test failure message.
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: 9c010d70b02153ac3d074c7f446ed3ee61e4026e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c010d70b02153ac3d074c7f4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 11 09:10:42 2014 +0900 advapi32/tests: Correct the test failure message. --- dlls/advapi32/tests/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 044c3f0..907c73b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4988,7 +4988,7 @@ static void test_filemap_security(void) } else { - ok(!mapping, "CreateFileMapping(%04x) error %d\n", prot_map[i].prot, GetLastError()); + ok(!mapping, "CreateFileMapping(%04x) should fail\n", prot_map[i].prot); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); continue; }

1 0

Nikolay Sivov : ole32: Use precomposed table for GUID from string conversion.
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: 747c649d99dceffd03bb1458fa17049618501b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=747c649d99dceffd03bb1458f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 08:34:41 2014 +0400 ole32: Use precomposed table for GUID from string conversion. --- dlls/ole32/compobj.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 719d9de..e615599 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2065,11 +2065,21 @@ static inline BOOL is_valid_hex(WCHAR c) return TRUE; } +static const BYTE guid_conv_table[256] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, /* 0x30 */ + 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 */ + 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf /* 0x60 */ +}; + /* conversion helper for CLSIDFromString/IIDFromString */ static BOOL guid_from_string(LPCWSTR s, GUID *id) { int i; - BYTE table[256]; if (!s || s[0]!='{') { memset( id, 0, sizeof (CLSID) ); @@ -2079,37 +2089,26 @@ static BOOL guid_from_string(LPCWSTR s, GUID *id) TRACE("%s -> %p\n", debugstr_w(s), id); - /* quick lookup table */ - memset(table, 0, 256); - - for (i = 0; i < 10; i++) { - table['0' + i] = i; - } - for (i = 0; i < 6; i++) { - table['A' + i] = i+10; - table['a' + i] = i+10; - } - /* in form {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */ id->Data1 = 0; for (i = 1; i < 9; i++) { if (!is_valid_hex(s[i])) return FALSE; - id->Data1 = (id->Data1 << 4) | table[s[i]]; + id->Data1 = (id->Data1 << 4) | guid_conv_table[s[i]]; } if (s[9]!='-') return FALSE; id->Data2 = 0; for (i = 10; i < 14; i++) { if (!is_valid_hex(s[i])) return FALSE; - id->Data2 = (id->Data2 << 4) | table[s[i]]; + id->Data2 = (id->Data2 << 4) | guid_conv_table[s[i]]; } if (s[14]!='-') return FALSE; id->Data3 = 0; for (i = 15; i < 19; i++) { if (!is_valid_hex(s[i])) return FALSE; - id->Data3 = (id->Data3 << 4) | table[s[i]]; + id->Data3 = (id->Data3 << 4) | guid_conv_table[s[i]]; } if (s[19]!='-') return FALSE; @@ -2119,7 +2118,7 @@ static BOOL guid_from_string(LPCWSTR s, GUID *id) i++; } if (!is_valid_hex(s[i]) || !is_valid_hex(s[i+1])) return FALSE; - id->Data4[(i-20)/2] = table[s[i]] << 4 | table[s[i+1]]; + id->Data4[(i-20)/2] = guid_conv_table[s[i]] << 4 | guid_conv_table[s[i+1]]; } if (s[37] == '}' && s[38] == '\0')

1 0

Nikolay Sivov : ole32: Remove ERR() output that's not really helpful.
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: e593c3068c4a9ea4c094a38204cb355a37fd015c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e593c3068c4a9ea4c094a3820… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 08:35:08 2014 +0400 ole32: Remove ERR() output that's not really helpful. --- dlls/ole32/compobj.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index e615599..4429627 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2378,10 +2378,7 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) LONG progidlen = 0; if (!ppszProgID) - { - ERR("ppszProgId isn't optional\n"); return E_INVALIDARG; - } *ppszProgID = NULL; @@ -2449,10 +2446,7 @@ HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID clsid) ACTCTX_SECTION_KEYED_DATA data; if (!progid || !clsid) - { - ERR("neither progid (%p) nor clsid (%p) are optional\n", progid, clsid); return E_INVALIDARG; - } data.cbSize = sizeof(data); if (FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION, @@ -2534,10 +2528,7 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) } if (!pclsid) - { - ERR("pclsid isn't optional\n"); return E_INVALIDARG; - } EnterCriticalSection(&apt->cs);

1 0

Hans Leidekker : winhttp/tests: Fix a couple of test failures.
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: 50feb7b708c0d486f876f19d98e56ed67b7ac581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50feb7b708c0d486f876f19d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 11 09:54:22 2014 +0100 winhttp/tests: Fix a couple of test failures. --- dlls/winhttp/tests/winhttp.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 477d1c6..e14f366 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2072,13 +2072,19 @@ static void test_no_headers(int port) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - ret = WinHttpReceiveResponse(req, NULL); - error = GetLastError(); - ok(!ret, "expected failure\n"); - ok(error == ERROR_WINHTTP_INVALID_SERVER_RESPONSE, "got %u\n", error); + if (!ret) + { + error = GetLastError(); + ok(error == ERROR_WINHTTP_INVALID_SERVER_RESPONSE, "got %u\n", error); + } + else + { + SetLastError(0xdeadbeef); + ret = WinHttpReceiveResponse(req, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_WINHTTP_INVALID_SERVER_RESPONSE, "got %u\n", error); + } WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2355,11 +2361,10 @@ static void test_IWinHttpRequest(void) { static const WCHAR usernameW[] = {'u','s','e','r','n','a','m','e',0}; static const WCHAR passwordW[] = {'p','a','s','s','w','o','r','d',0}; - static const WCHAR url1W[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',0}; - static const WCHAR url2W[] = {'w','i','n','e','h','q','.','o','r','g',0}; - static const WCHAR url3W[] = {'h','t','t','p',':','/','/','c','r','o','s','s','o','v','e','r','.', - 'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m','/', - 'p','o','s','t','t','e','s','t','.','p','h','p',0}; + static const WCHAR url1W[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR url2W[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR url3W[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.', + 'o','r','g','/','t','e','s','t','s','/','p','o','s','t','.','p','h','p',0}; static const WCHAR method1W[] = {'G','E','T',0}; static const WCHAR method2W[] = {'I','N','V','A','L','I','D',0}; static const WCHAR method3W[] = {'P','O','S','T',0};

1 0

Hans Leidekker : winhttp/tests: Improve tracing.
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: 25eb10058c5fad7ab8ba3a1c1ab05e052b7f5553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25eb10058c5fad7ab8ba3a1c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 11 09:54:45 2014 +0100 winhttp/tests: Improve tracing. --- dlls/winhttp/tests/notification.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index f81a952..ffbea03 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -90,7 +90,7 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW DWORD size = sizeof(struct info *); WinHttpQueryOption( handle, WINHTTP_OPTION_CONTEXT_VALUE, &info, &size ); } - ok(i < info->count, "unexpected notification 0x%08x\n", status); + ok(i < info->count, "%u: unexpected notification 0x%08x\n", info->line, status); if (i >= info->count) return; status_ok = (info->test[i].status == status);

1 0

Hans Leidekker : wbemprox: Don't list loopback network adapters.
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: 386d2aa8b7f704f992a6685d9be9616da660f49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=386d2aa8b7f704f992a6685d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 11 09:55:48 2014 +0100 wbemprox: Don't list loopback network adapters. --- dlls/wbemprox/builtin.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index afa32b5..4b02ea2 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1616,7 +1616,10 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e heap_free( buffer ); return FILL_STATUS_FAILED; } - for (aa = buffer; aa; aa = aa->Next) count++; + for (aa = buffer; aa; aa = aa->Next) + { + if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK) count++; + } if (!resize_table( table, count, sizeof(*rec) )) { heap_free( buffer ); @@ -1624,6 +1627,8 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e } for (aa = buffer; aa; aa = aa->Next) { + if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; + rec = (struct record_networkadapter *)(table->data + offset); sprintfW( device_id, fmtW, aa->u.s.IfIndex ); rec->adaptertype = get_adaptertype( aa->IfType, &physical ); @@ -1669,7 +1674,10 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st heap_free( buffer ); return FILL_STATUS_FAILED; } - for (aa = buffer; aa; aa = aa->Next) count++; + for (aa = buffer; aa; aa = aa->Next) + { + if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK) count++; + } if (!resize_table( table, count, sizeof(*rec) )) { heap_free( buffer ); @@ -1677,6 +1685,8 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st } for (aa = buffer; aa; aa = aa->Next) { + if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; + rec = (struct record_networkadapterconfig *)(table->data + offset); rec->index = aa->u.s.IfIndex; rec->ipconnectionmetric = 20;

1 0

Henri Verbeet : dxgi: Implement CreateDXGIFactory1().
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: a13a546573e6af467a151f1f6ab1021237f7cf45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a13a546573e6af467a151f1f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 11 11:42:20 2014 +0100 dxgi: Implement CreateDXGIFactory1(). --- dlls/dxgi/dxgi.spec | 1 + dlls/dxgi/dxgi_main.c | 32 +++++++------------------------- dlls/dxgi/dxgi_private.h | 3 ++- dlls/dxgi/factory.c | 31 +++++++++++++++++++++++++++++-- 4 files changed, 39 insertions(+), 28 deletions(-) diff --git a/dlls/dxgi/dxgi.spec b/dlls/dxgi/dxgi.spec index 853d8e2..2232f88 100644 --- a/dlls/dxgi/dxgi.spec +++ b/dlls/dxgi/dxgi.spec @@ -1,3 +1,4 @@ @ stdcall CreateDXGIFactory(ptr ptr) +@ stdcall CreateDXGIFactory1(ptr ptr) @ stdcall DXGID3D10CreateDevice(ptr ptr ptr long ptr ptr) @ stdcall DXGID3D10RegisterLayers(ptr long) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 8249b88..3414c4f 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -66,36 +66,18 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) return TRUE; } -HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) +HRESULT WINAPI CreateDXGIFactory1(REFIID riid, void **factory) { - struct dxgi_factory *object; - HRESULT hr; - TRACE("riid %s, factory %p\n", debugstr_guid(riid), factory); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - ERR("Failed to allocate DXGI factory object memory\n"); - *factory = NULL; - return E_OUTOFMEMORY; - } - - hr = dxgi_factory_init(object); - if (FAILED(hr)) - { - WARN("Failed to initialize swapchain, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - *factory = NULL; - return hr; - } - - TRACE("Created IDXGIFactory %p\n", object); + return dxgi_factory_create(riid, factory, TRUE); +} - hr = IDXGIFactory_QueryInterface((IDXGIFactory *)object, riid, factory); - IDXGIFactory_Release((IDXGIFactory *)object); +HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) +{ + TRACE("riid %s, factory %p\n", debugstr_guid(riid), factory); - return hr; + return dxgi_factory_create(riid, factory, FALSE); } static BOOL get_layer(enum dxgi_device_layer_id id, struct dxgi_device_layer *layer) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 20401c7..24d9a26 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -83,9 +83,10 @@ struct dxgi_factory struct wined3d *wined3d; UINT adapter_count; IWineDXGIAdapter **adapters; + BOOL extended; }; -HRESULT dxgi_factory_init(struct dxgi_factory *factory) DECLSPEC_HIDDEN; +HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) DECLSPEC_HIDDEN; /* IDXGIDevice */ struct dxgi_device diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 18a9a81..ac2450e 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -33,12 +33,14 @@ static inline struct dxgi_factory *impl_from_IWineDXGIFactory(IWineDXGIFactory * static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IWineDXGIFactory *iface, REFIID riid, void **object) { + struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface); + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDXGIObject) || IsEqualGUID(riid, &IID_IDXGIFactory) - || IsEqualGUID(riid, &IID_IDXGIFactory1) + || (factory->extended && IsEqualGUID(riid, &IID_IDXGIFactory1)) || IsEqualGUID(riid, &IID_IWineDXGIFactory)) { IUnknown_AddRef(iface); @@ -318,7 +320,7 @@ static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = dxgi_factory_get_wined3d, }; -HRESULT dxgi_factory_init(struct dxgi_factory *factory) +static HRESULT dxgi_factory_init(struct dxgi_factory *factory, BOOL extended) { HRESULT hr; UINT i; @@ -379,6 +381,8 @@ HRESULT dxgi_factory_init(struct dxgi_factory *factory) factory->adapters[i] = &adapter->IWineDXGIAdapter_iface; } + factory->extended = extended; + return S_OK; fail: @@ -388,3 +392,26 @@ fail: LeaveCriticalSection(&dxgi_cs); return hr; } + +HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) +{ + struct dxgi_factory *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = dxgi_factory_init(object, extended))) + { + WARN("Failed to initialize factory, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created factory %p.\n", object); + + hr = IWineDXGIFactory_QueryInterface(&object->IWineDXGIFactory_iface, riid, factory); + IWineDXGIFactory_Release(&object->IWineDXGIFactory_iface); + + return hr; +}

1 0

Henri Verbeet : dxgi/tests: Add tests for CreateDXGIFactory().
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: e806b5bab9dfd0e5a0f625f810f85d23f39ef705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e806b5bab9dfd0e5a0f625f81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 11 11:42:21 2014 +0100 dxgi/tests: Add tests for CreateDXGIFactory(). --- dlls/dxgi/tests/device.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index f44e831..b4337fa 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -21,6 +21,8 @@ #include "d3d10.h" #include "wine/test.h" +static HRESULT (WINAPI *pCreateDXGIFactory1)(REFIID iid, void **factory); + static IDXGIDevice *create_device(void) { IDXGIDevice *dxgi_device; @@ -499,12 +501,78 @@ static void test_createswapchain(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_factory(void) +{ + IDXGIFactory1 *factory; + IUnknown *iface; + HRESULT hr; + + iface = (void *)0xdeadbeef; + hr = CreateDXGIFactory(&IID_IDXGIDevice, (void **)&iface); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + hr = CreateDXGIFactory(&IID_IUnknown, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IUnknown, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = CreateDXGIFactory(&IID_IDXGIObject, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIObject, hr %#x.\n", hr); + IUnknown_Release(iface); + + factory = (void *)0xdeadbeef; + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory, hr %#x.\n", hr); + hr = IUnknown_QueryInterface(iface, &IID_IDXGIFactory1, (void **)&factory); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(!factory, "Got unexpected factory %p.\n", factory); + IUnknown_Release(iface); + + iface = (void *)0xdeadbeef; + hr = CreateDXGIFactory(&IID_IDXGIFactory1, (void **)&iface); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + if (!pCreateDXGIFactory1) + { + win_skip("CreateDXGIFactory1 not available, skipping tests.\n"); + return; + } + + iface = (void *)0xdeadbeef; + hr = pCreateDXGIFactory1(&IID_IDXGIDevice, (void **)&iface); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + hr = pCreateDXGIFactory1(&IID_IUnknown, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IUnknown, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = pCreateDXGIFactory1(&IID_IDXGIObject, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIObject, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = pCreateDXGIFactory1(&IID_IDXGIFactory, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory, hr %#x.\n", hr); + hr = IUnknown_QueryInterface(iface, &IID_IDXGIFactory1, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to query IDXGIFactory1 interface, hr %#x.\n", hr); + IDXGIFactory1_Release(factory); + IUnknown_Release(iface); + + hr = pCreateDXGIFactory1(&IID_IDXGIFactory1, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory1, hr %#x.\n", hr); + IUnknown_Release(iface); +} + START_TEST(device) { + pCreateDXGIFactory1 = (void *)GetProcAddress(GetModuleHandleA("dxgi.dll"), "CreateDXGIFactory1"); + test_adapter_desc(); test_device_interfaces(); test_create_surface(); test_parents(); test_output(); test_createswapchain(); + test_create_factory(); }

1 0

Henri Verbeet : dxgi/tests: Also test for ID3D10Device1 and ID3D11Device in test_device_interfaces().
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: 2be432b4df37de6890c66557d36178902f2dd48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2be432b4df37de6890c66557d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 11 11:42:22 2014 +0100 dxgi/tests: Also test for ID3D10Device1 and ID3D11Device in test_device_interfaces(). --- dlls/d3d10/tests/device.c | 49 ----------------------------------------- dlls/d3d10core/tests/device.c | 34 ---------------------------- dlls/dxgi/tests/device.c | 38 ++++++++++++++++++++------------ 3 files changed, 24 insertions(+), 97 deletions(-) diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index 8df4150..fa8f708 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -21,54 +21,6 @@ #include "d3d10.h" #include "wine/test.h" -static ID3D10Device *create_device(void) -{ - ID3D10Device *device; - - if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) - return device; - 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; - - return NULL; -} - -static void test_device_interfaces(void) -{ - ID3D10Device *device; - ULONG refcount; - IUnknown *obj; - HRESULT hr; - - device = create_device(); - if (!device) - { - skip("Failed to create device, skipping tests\n"); - return; - } - - if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_IUnknown, (void **)&obj))) - IUnknown_Release(obj); - ok(SUCCEEDED(hr), "ID3D10Device does not implement IUnknown (%#x)\n", hr); - - if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_ID3D10Device, (void **)&obj))) - IUnknown_Release(obj); - ok(SUCCEEDED(hr), "ID3D10Device does not implement ID3D10Device (%#x)\n", hr); - - if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_IDXGIObject, (void **)&obj))) - IUnknown_Release(obj); - ok(SUCCEEDED(hr), "ID3D10Device does not implement IDXGIObject (%#x)\n", hr); - - if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&obj))) - IUnknown_Release(obj); - ok(SUCCEEDED(hr), "ID3D10Device does not implement IDXGIDevice (%#x)\n", hr); - - refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left\n", refcount); -} - static void test_stateblock_mask(void) { static const struct @@ -229,6 +181,5 @@ static void test_stateblock_mask(void) START_TEST(device) { - test_device_interfaces(); test_stateblock_mask(); } diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8278afc..213987b 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -35,39 +35,6 @@ static ID3D10Device *create_device(void) return NULL; } -static void test_device_interfaces(void) -{ - ID3D10Device *device; - ULONG refcount; - IUnknown *obj; - HRESULT hr; - - if (!(device = create_device())) - { - skip("Failed to create device, skipping tests.\n"); - return; - } - - if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_IUnknown, (void **)&obj))) - IUnknown_Release(obj); - ok(SUCCEEDED(hr), "ID3D10Device does not implement IUnknown\n"); - - if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_IDXGIObject, (void **)&obj))) - IUnknown_Release(obj); - ok(SUCCEEDED(hr), "ID3D10Device does not implement IDXGIObject\n"); - - if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&obj))) - IUnknown_Release(obj); - ok(SUCCEEDED(hr), "ID3D10Device does not implement IDXGIDevice\n"); - - if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_ID3D10Device, (void **)&obj))) - IUnknown_Release(obj); - ok(SUCCEEDED(hr), "ID3D10Device does not implement ID3D10Device\n"); - - refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left\n", refcount); -} - static void test_create_texture2d(void) { D3D10_TEXTURE2D_DESC desc; @@ -761,7 +728,6 @@ static void test_create_predicate(void) START_TEST(device) { - test_device_interfaces(); test_create_texture2d(); test_create_texture3d(); test_create_depthstencil_view(); diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index b4337fa..5572a54 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -18,7 +18,7 @@ #define COBJMACROS #include "initguid.h" -#include "d3d10.h" +#include "d3d11.h" #include "wine/test.h" static HRESULT (WINAPI *pCreateDXGIFactory1)(REFIID iid, void **factory); @@ -49,8 +49,8 @@ success: static void test_device_interfaces(void) { IDXGIDevice *device; + IUnknown *iface; ULONG refcount; - IUnknown *obj; HRESULT hr; if (!(device = create_device())) @@ -59,21 +59,31 @@ static void test_device_interfaces(void) return; } - if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_IUnknown, (void **)&obj))) - IUnknown_Release(obj); - ok(SUCCEEDED(hr), "IDXGIDevice does not implement IUnknown\n"); + hr = IDXGIDevice_QueryInterface(device, &IID_IUnknown, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to query IUnknown interface, hr %#x.\n", hr); + IUnknown_Release(iface); - if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_IDXGIObject, (void **)&obj))) - IUnknown_Release(obj); - ok(SUCCEEDED(hr), "IDXGIDevice does not implement IDXGIObject\n"); + hr = IDXGIDevice_QueryInterface(device, &IID_IDXGIObject, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to query IDXGIObject interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = IDXGIDevice_QueryInterface(device, &IID_IDXGIDevice, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to query IDXGIDevice interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Device, (void **)&iface); + ok(SUCCEEDED(hr), "Failed to query ID3D10Device interface, hr %#x.\n", hr); + IUnknown_Release(iface); - if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_IDXGIDevice, (void **)&obj))) - IUnknown_Release(obj); - ok(SUCCEEDED(hr), "IDXGIDevice does not implement IDXGIDevice\n"); + if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Device1, (void **)&iface))) + IUnknown_Release(iface); + todo_wine ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Failed to query ID3D10Device1 interface, hr %#x.\n", hr); - if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Device, (void **)&obj))) - IUnknown_Release(obj); - ok(SUCCEEDED(hr), "IDXGIDevice does not implement ID3D10Device\n"); + if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_ID3D11Device, (void **)&iface))) + IUnknown_Release(iface); + todo_wine ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Failed to query ID3D11Device interface, hr %#x.\n", hr); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Henri Verbeet : d3d10core: Implement ID3D10Device1.
by Alexandre Julliard 11 Feb '14

11 Feb '14

Module: wine Branch: master Commit: 409c872c996337a85992e44e12e1acce716e291d URL: http://source.winehq.org/git/wine.git/?a=commit;h=409c872c996337a85992e44e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 11 11:42:23 2014 +0100 d3d10core: Implement ID3D10Device1. --- dlls/d3d10core/d3d10core_private.h | 6 +- dlls/d3d10core/device.c | 270 ++++++++++++++++++++---------------- dlls/d3d10core/texture.c | 7 +- dlls/dxgi/tests/device.c | 2 +- 4 files changed, 157 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=409c872c996337a85992e…

1 0