February 2014 - Wine-Commits

Alistair Leslie-Hughes : dpnet/tests: Add IDirectPlay8Peer_EnumHosts tests.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: d3b140798252c465fcbdc82f3a34943335cb181d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b140798252c465fcbdc82f3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 11 15:29:53 2014 +1100 dpnet/tests: Add IDirectPlay8Peer_EnumHosts tests. --- dlls/dpnet/tests/peer.c | 59 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index 8ae0afe..d2f0ccf 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -23,21 +23,12 @@ #include <dplay8.h> #include "wine/test.h" -static char *show_guid(const GUID *guid, char *buf) -{ - sprintf(buf, - "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); - - return buf; -} static IDirectPlay8Peer* peer = NULL; static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, PVOID buffer) { + trace("DirectPlayMessageHandler: 0x%08x\n", message_id); return S_OK; } @@ -64,7 +55,6 @@ static void test_enum_service_providers(void) DWORD items, size; DWORD i; HRESULT hr; - char guid[39] ; size = 0; items = 0; @@ -84,7 +74,7 @@ static void test_enum_service_providers(void) for (i=0;i<items;i++) { trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info->pwszName)); - trace("Found guid: %s\n", show_guid(&serv_prov_info->guid, guid)); + trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info->guid)); serv_prov_info++; } @@ -109,7 +99,7 @@ static void test_enum_service_providers(void) for (i=0;i<items;i++) { trace("Found adapter: %s\n", wine_dbgstr_w(serv_prov_info->pwszName)); - trace("Found adapter guid: %s\n", show_guid(&serv_prov_info->guid, guid)); + trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info->guid)); serv_prov_info++; } @@ -118,6 +108,48 @@ static void test_enum_service_providers(void) ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); } +static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; + +static void test_enum_hosts(void) +{ + HRESULT hr; + IDirectPlay8Address *host = NULL; + IDirectPlay8Address *local = NULL; + DPN_APPLICATION_DESC appdesc; + DPNHANDLE async = 0; + static const WCHAR localhost[] = {'1','2','7','.','0','.','0','.','1',0}; + + memset( &appdesc, 0, sizeof(DPN_APPLICATION_DESC) ); + appdesc.dwSize = sizeof( DPN_APPLICATION_DESC ); + appdesc.guidApplication = appguid; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&local); + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_SetSP(local, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "IDirectPlay8Address_SetSP failed with 0x%08x\n", hr); + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&host); + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_SetSP(host, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "IDirectPlay8Address_SetSP failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_AddComponent(host, DPNA_KEY_HOSTNAME, localhost, sizeof(localhost), + DPNA_DATATYPE_STRING); + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); + + hr = IDirectPlay8Peer_EnumHosts(peer, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); + todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Peer_EnumServiceProviders failed with 0x%08x\n", hr); + todo_wine ok(async, "No Handle returned\n"); + + hr = IDirectPlay8Peer_CancelAsyncOperation(peer, async, 0); + todo_wine ok(hr == S_OK, "IDirectPlay8Peer_CancelAsyncOperation failed with 0x%08x\n", hr); + + IDirectPlay8Address_Release(local); + IDirectPlay8Address_Release(host); +} + static void test_get_sp_caps(void) { DPN_SP_CAPS caps; @@ -164,6 +196,7 @@ START_TEST(peer) { test_init_dp(); test_enum_service_providers(); + test_enum_hosts(); test_get_sp_caps(); test_cleanup_dp(); }

1 0

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

Feb. 11, 2014

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 Feb. 11, 2014

Feb. 11, 2014

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 Feb. 11, 2014

Feb. 11, 2014

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 Feb. 11, 2014

Feb. 11, 2014

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: Also test for ID3D10Device1 and ID3D11Device in test_device_interfaces().
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

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 : d3d10_1: Implement D3D10CreateDevice1().
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: d799eb2d8385456082a3fd72c58f531c4807e52f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d799eb2d8385456082a3fd72c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 11 11:42:24 2014 +0100 d3d10_1: Implement D3D10CreateDevice1(). --- configure | 2 + configure.ac | 1 + dlls/d3d10_1/Makefile.in | 8 ++ dlls/d3d10_1/d3d10_1.spec | 30 +++++++ dlls/d3d10_1/d3d10_1_main.c | 182 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3d10_1/version.rc | 26 +++++++ 6 files changed, 249 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d799eb2d8385456082a3f…

1 0

Jacek Caban : wmp.idl: Added proper version independent ProgID.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: 4016bb18deaeab9440b2b171511a4d2da2fb9767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4016bb18deaeab9440b2b1715… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 11 11:49:03 2014 +0100 wmp.idl: Added proper version independent ProgID. --- include/wmp.idl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/wmp.idl b/include/wmp.idl index 429fc8d..d9cd857 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -43,7 +43,8 @@ library WMPLib { [ helpstring("Windows Media Player"), threading(apartment), - progid("WMPlayer.OCX"), + progid("WMPlayer.OCX.7"), + vi_progid("WMPlayer.OCX"), uuid(6bf52a52-394a-11d3-b153-00c04f79faa6) ] coclass WindowsMediaPlayer

1 0

Jacek Caban : wmp: Added IOleInPlaceObjectWindowless stub implementation.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: 07c3e134c84beef5c592a314630026d3615e5c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c3e134c84beef5c592a3146… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 11 11:50:48 2014 +0100 wmp: Added IOleInPlaceObjectWindowless stub implementation. --- dlls/wmp/oleobj.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/tests/oleobj.c | 4 ++ 2 files changed, 113 insertions(+) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 01204e2..773b0b0 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -26,6 +26,7 @@ struct WindowsMediaPlayer { IOleObject IOleObject_iface; IProvideClassInfo2 IProvideClassInfo2_iface; IPersistStreamInit IPersistStreamInit_iface; + IOleInPlaceObjectWindowless IOleInPlaceObjectWindowless_iface; LONG ref; @@ -68,6 +69,15 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v }else if(IsEqualGUID(riid, &IID_IPersistStreamInit)) { TRACE("(%p)->(IID_IPersistStreamInit %p)\n", This, ppv); *ppv = &This->IPersistStreamInit_iface; + }else if(IsEqualGUID(riid, &IID_IOleWindow)) { + TRACE("(%p)->(IID_IOleWindow %p)\n", This, ppv); + *ppv = &This->IOleInPlaceObjectWindowless_iface; + }else if(IsEqualGUID(riid, &IID_IOleInPlaceObject)) { + TRACE("(%p)->(IID_IOleInPlaceObject %p)\n", This, ppv); + *ppv = &This->IOleInPlaceObjectWindowless_iface; + }else if(IsEqualGUID(riid, &IID_IOleInPlaceObjectWindowless)) { + TRACE("(%p)->(IID_IOleInPlaceObjectWindowless %p)\n", This, ppv); + *ppv = &This->IOleInPlaceObjectWindowless_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -318,6 +328,104 @@ static const IOleObjectVtbl OleObjectVtbl = { OleObject_SetColorScheme }; +static inline WindowsMediaPlayer *impl_from_IOleInPlaceObjectWindowless(IOleInPlaceObjectWindowless *iface) +{ + return CONTAINING_RECORD(iface, WindowsMediaPlayer, IOleInPlaceObjectWindowless_iface); +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_QueryInterface(IOleInPlaceObjectWindowless *iface, + REFIID riid, void **ppv) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + return IOleObject_QueryInterface(&This->IOleObject_iface, riid, ppv); +} + +static ULONG WINAPI OleInPlaceObjectWindowless_AddRef(IOleInPlaceObjectWindowless *iface) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + return IOleObject_AddRef(&This->IOleObject_iface); +} + +static ULONG WINAPI OleInPlaceObjectWindowless_Release(IOleInPlaceObjectWindowless *iface) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + return IOleObject_Release(&This->IOleObject_iface); +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_GetWindow(IOleInPlaceObjectWindowless *iface, HWND *phwnd) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + FIXME("(%p)->(%p)\n", This, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_ContextSensitiveHelp(IOleInPlaceObjectWindowless *iface, + BOOL fEnterMode) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + FIXME("(%p)->(%x)\n", This, fEnterMode); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_InPlaceDeactivate(IOleInPlaceObjectWindowless *iface) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_UIDeactivate(IOleInPlaceObjectWindowless *iface) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_SetObjectRects(IOleInPlaceObjectWindowless *iface, + LPCRECT lprcPosRect, LPCRECT lprcClipRect) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + FIXME("(%p)->(%p %p)\n", This, lprcPosRect, lprcClipRect); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_ReactivateAndUndo(IOleInPlaceObjectWindowless *iface) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_OnWindowMessage(IOleInPlaceObjectWindowless *iface, + UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *lpResult) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + FIXME("(%p)->(%u %lu %lu %p)\n", This, msg, wParam, lParam, lpResult); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleInPlaceObjectWindowless_GetDropTarget(IOleInPlaceObjectWindowless *iface, + IDropTarget **ppDropTarget) +{ + WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); + FIXME("(%p)->(%p)\n", This, ppDropTarget); + return E_NOTIMPL; +} + +static const IOleInPlaceObjectWindowlessVtbl OleInPlaceObjectWindowlessVtbl = { + OleInPlaceObjectWindowless_QueryInterface, + OleInPlaceObjectWindowless_AddRef, + OleInPlaceObjectWindowless_Release, + OleInPlaceObjectWindowless_GetWindow, + OleInPlaceObjectWindowless_ContextSensitiveHelp, + OleInPlaceObjectWindowless_InPlaceDeactivate, + OleInPlaceObjectWindowless_UIDeactivate, + OleInPlaceObjectWindowless_SetObjectRects, + OleInPlaceObjectWindowless_ReactivateAndUndo, + OleInPlaceObjectWindowless_OnWindowMessage, + OleInPlaceObjectWindowless_GetDropTarget +}; + static inline WindowsMediaPlayer *impl_from_IProvideClassInfo2(IProvideClassInfo2 *iface) { return CONTAINING_RECORD(iface, WindowsMediaPlayer, IProvideClassInfo2_iface); @@ -466,6 +574,7 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, wmp->IOleObject_iface.lpVtbl = &OleObjectVtbl; wmp->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; wmp->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; + wmp->IOleInPlaceObjectWindowless_iface.lpVtbl = &OleInPlaceObjectWindowlessVtbl; wmp->ref = 1; diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index f209cc3..8f2eed2 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -622,6 +622,10 @@ static void test_QI(IUnknown *unk) hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&tmp); ok(hres == E_NOINTERFACE, "Got IQuickActivate iface when no expected\n"); + + hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceObjectWindowless, (void**)&tmp); + ok(hres == S_OK, "Could not get IOleInPlaceObjectWindowless iface: %08x\n", hres); + IUnknown_Release(tmp); } static void test_wmp(void)

1 0

Dmitry Timoshkov : scrrun: Move the counter check into the code block where counter is actually incremented.
by Alexandre Julliard Feb. 11, 2014

Feb. 11, 2014

Module: wine Branch: master Commit: 173233cfe382ccb06d586d01130c8533f57c8061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=173233cfe382ccb06d586d011… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 10 15:48:27 2014 +0900 scrrun: Move the counter check into the code block where counter is actually incremented. --- dlls/scrrun/filesystem.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 59add71..c41709c 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -540,10 +540,9 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel V_VT(&var[count]) = VT_DISPATCH; V_DISPATCH(&var[count]) = (IDispatch*)folder; count++; - } - - if (count >= celt) break; + if (count >= celt) break; + } } while (FindNextFileW(handle, &data)); if (fetched)

1 0