August 2015 - Wine-Commits - list.winehq.org

Józef Kucia : d3d11: Implement d3d11_texture2d_GetDesc().
by Alexandre Julliard Aug. 28, 2015

Aug. 28, 2015

Module: wine Branch: master Commit: acec54e707ddc8f8cbca6e6acb4a7e7d70d27047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acec54e707ddc8f8cbca6e6ac… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 28 00:39:15 2015 +0200 d3d11: Implement d3d11_texture2d_GetDesc(). --- dlls/d3d11/d3d11_private.h | 15 ++++- dlls/d3d11/device.c | 14 +++- dlls/d3d11/texture.c | 50 +++++++++----- dlls/d3d11/utils.c | 161 ++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 211 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=acec54e707ddc8f8cbca6…

1 0

Stefan Dösinger : dxgi/tests: Test presentation parameter combinations.
by Alexandre Julliard Aug. 28, 2015

Aug. 28, 2015

Module: wine Branch: master Commit: f805fb11f67c73cb7a3a9e71680acf0bafec4126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f805fb11f67c73cb7a3a9e716… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 27 23:05:03 2015 +0200 dxgi/tests: Test presentation parameter combinations. --- dlls/dxgi/factory.c | 30 +++++++- dlls/dxgi/tests/device.c | 187 +++++++++++++++++++++++++++++++++++++++++++++++ include/dxgi.idl | 2 + 3 files changed, 215 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f805fb11f67c73cb7a3a9…

1 0

Thomas Faller : winex11.drv: Fix uninitialized memory.
by Alexandre Julliard Aug. 28, 2015

Aug. 28, 2015

Module: wine Branch: master Commit: 8c1c7d19fe1bbcb9e9ca9daf5a454a1d15a44c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c1c7d19fe1bbcb9e9ca9daf5… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Thu Aug 27 23:19:46 2015 +0200 winex11.drv: Fix uninitialized memory. --- dlls/winex11.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7651590..b7ec06e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1024,6 +1024,7 @@ void update_net_wm_states( struct x11drv_win_data *data ) xev.xclient.send_event = True; xev.xclient.format = 32; xev.xclient.data.l[3] = 1; + xev.xclient.data.l[4] = 0; for (i = 0; i < NB_NET_WM_STATES; i++) {

1 0

Dmitry Timoshkov : winhttp/tests: Add a test for IWinHttpRequest::Invoke.
by Alexandre Julliard Aug. 28, 2015

Aug. 28, 2015

Module: wine Branch: master Commit: f46868fe30d5646fb71c0be5c4a3a9ec10ec7ebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46868fe30d5646fb71c0be5c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 27 18:28:32 2015 +0800 winhttp/tests: Add a test for IWinHttpRequest::Invoke. --- dlls/winhttp/tests/winhttp.c | 71 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 9bda2af..c3a3f11 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -26,11 +26,14 @@ #include <winhttp.h> #include <wincrypt.h> #include <winreg.h> -#include "initguid.h" +#include <initguid.h> #include <httprequest.h> +#include <httprequestid.h> #include "wine/test.h" +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + static const WCHAR test_useragent[] = {'W','i','n','e',' ','R','e','g','r','e','s','s','i','o','n',' ','T','e','s','t',0}; static const WCHAR test_winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; @@ -3539,6 +3542,71 @@ static void test_IWinHttpRequest(void) CoUninitialize(); } +static void test_IWinHttpRequest_Invoke(void) +{ + static const WCHAR utf8W[] = {'U','T','F','-','8',0}; + static const WCHAR regid[] = {'W','i','n','H','t','t','p','.','W','i','n','H','t','t','p','R','e','q','u','e','s','t','.','5','.','1',0}; + WCHAR openW[] = {'O','p','e','n',0}; + WCHAR optionW[] = {'O','p','t','i','o','n',0}; + OLECHAR *open = openW, *option = optionW; + BSTR utf8; + CLSID clsid; + IWinHttpRequest *request; + IDispatch *dispatch; + DISPID id; + DISPPARAMS params; + VARIANT arg[3], ret; + UINT err; + BOOL bret; + HRESULT hr; + + CoInitialize(NULL); + + hr = CLSIDFromProgID(regid, &clsid); + ok(hr == S_OK, "CLSIDFromProgID error %#x\n", hr); + bret = IsEqualIID(&clsid, &CLSID_WinHttpRequest); + ok(bret || broken(!bret) /* win2003 */, "not expected %s\n", wine_dbgstr_guid(&clsid)); + + hr = CoCreateInstance(&CLSID_WinHttpRequest, 0, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&request); + ok(hr == S_OK, "error %#x\n", hr); + + hr = IWinHttpRequest_QueryInterface(request, &IID_IDispatch, (void **)&dispatch); + ok(hr == S_OK, "error %#x\n", hr); + IDispatch_Release(dispatch); + + hr = IWinHttpRequest_GetIDsOfNames(request, &IID_NULL, &open, 1, 0x0409, &id); + ok(hr == S_OK, "error %#x\n", hr); + ok(id == DISPID_HTTPREQUEST_OPEN, "expected DISPID_HTTPREQUEST_OPEN, got %u\n", id); + + hr = IWinHttpRequest_GetIDsOfNames(request, &IID_NULL, &option, 1, 0x0409, &id); + ok(hr == S_OK, "error %#x\n", hr); + ok(id == DISPID_HTTPREQUEST_OPTION, "expected DISPID_HTTPREQUEST_OPTION, got %u\n", id); + + memset(&params, 0, sizeof(params)); + params.cArgs = 2; + params.cNamedArgs = 0; + params.rgvarg = arg; + V_VT(&arg[0]) = VT_BSTR; + utf8 = SysAllocString(utf8W); + V_BSTR(&arg[0]) = utf8; + V_VT(&arg[1]) = VT_R8; + V_R8(&arg[1]) = 2.0; + VariantInit(&ret); + hr = IWinHttpRequest_Invoke(request, id, &IID_NULL, 0, DISPATCH_METHOD, &params, NULL, NULL, &err); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); + + VariantInit(&ret); + hr = IWinHttpRequest_Invoke(request, id, &IID_NULL, 0, DISPATCH_METHOD, &params, &ret, NULL, &err); +todo_wine + ok(hr == S_OK, "error %#x\n", hr); + + SysFreeString(utf8); + IWinHttpRequest_Release(request); + + CoUninitialize(); +} + static void test_WinHttpDetectAutoProxyConfigUrl(void) { BOOL ret; @@ -3839,6 +3907,7 @@ START_TEST (winhttp) test_resolve_timeout(); test_credentials(); test_IWinHttpRequest(); + test_IWinHttpRequest_Invoke(); test_WinHttpDetectAutoProxyConfigUrl(); test_WinHttpGetIEProxyConfigForCurrentUser(); test_WinHttpGetProxyForUrl();

1 0

Hans Leidekker : netprofm: Add a stub implementation of INetworkConnection.
by Alexandre Julliard Aug. 27, 2015

Aug. 27, 2015

Module: wine Branch: master Commit: 2d22baa6be75b05175c739e42807ab67fbb68bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d22baa6be75b05175c739e42… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 27 15:04:51 2015 +0200 netprofm: Add a stub implementation of INetworkConnection. --- dlls/netprofm/list.c | 273 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 273 insertions(+) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 6364515..b39856d 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -36,6 +36,7 @@ #include "olectl.h" #include "wine/debug.h" +#include "wine/list.h" #include "netprofm_private.h" WINE_DEFAULT_DEBUG_CHANNEL(netprofm); @@ -50,12 +51,23 @@ static inline BOOL heap_free( void *mem ) return HeapFree( GetProcessHeap(), 0, mem ); } +struct connection +{ + INetworkConnection INetworkConnection_iface; + LONG refs; + struct list entry; + GUID id; + VARIANT_BOOL connected_to_internet; + VARIANT_BOOL connected; +}; + struct list_manager { INetworkListManager INetworkListManager_iface; INetworkCostManager INetworkCostManager_iface; IConnectionPointContainer IConnectionPointContainer_iface; LONG refs; + struct list connections; }; struct connection_point @@ -358,7 +370,16 @@ static ULONG WINAPI list_manager_Release( LONG refs = InterlockedDecrement( &mgr->refs ); if (!refs) { + struct list *ptr; + TRACE( "destroying %p\n", mgr ); + + while ((ptr = list_head( &mgr->connections ))) + { + struct connection *connection = LIST_ENTRY( ptr, struct connection, entry ); + list_remove( &connection->entry ); + INetworkConnection_Release( &connection->INetworkConnection_iface ); + } heap_free( mgr ); } return refs; @@ -583,6 +604,257 @@ static const struct IConnectionPointContainerVtbl cpc_vtbl = ConnectionPointContainer_FindConnectionPoint }; +static inline struct connection *impl_from_INetworkConnection( + INetworkConnection *iface ) +{ + return CONTAINING_RECORD( iface, struct connection, INetworkConnection_iface ); +} + +static HRESULT WINAPI connection_QueryInterface( + INetworkConnection *iface, REFIID riid, void **obj ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + TRACE( "%p, %s, %p\n", connection, debugstr_guid(riid), obj ); + + if (IsEqualIID( riid, &IID_INetworkConnection ) || + IsEqualIID( riid, &IID_IDispatch ) || + IsEqualIID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + WARN( "interface not supported %s\n", debugstr_guid(riid) ); + *obj = NULL; + return E_NOINTERFACE; + } + INetworkConnection_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI connection_AddRef( + INetworkConnection *iface ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + TRACE( "%p\n", connection ); + return InterlockedIncrement( &connection->refs ); +} + +static ULONG WINAPI connection_Release( + INetworkConnection *iface ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + LONG refs; + + TRACE( "%p\n", connection ); + + if (!(refs = InterlockedDecrement( &connection->refs ))) + { + list_remove( &connection->entry ); + heap_free( connection ); + } + return refs; +} + +static HRESULT WINAPI connection_GetTypeInfoCount( + INetworkConnection *iface, + UINT *count ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_GetTypeInfo( + INetworkConnection *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_GetIDsOfNames( + INetworkConnection *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_Invoke( + INetworkConnection *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_GetNetwork( + INetworkConnection *iface, + INetwork **ppNetwork ) +{ + FIXME( "%p, %p\n", iface, ppNetwork ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connection_get_IsConnectedToInternet( + INetworkConnection *iface, + VARIANT_BOOL *pbIsConnected ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + TRACE( "%p, %p\n", iface, pbIsConnected ); + + *pbIsConnected = connection->connected_to_internet; + return S_OK; +} + +static HRESULT WINAPI connection_get_IsConnected( + INetworkConnection *iface, + VARIANT_BOOL *pbIsConnected ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + TRACE( "%p, %p\n", iface, pbIsConnected ); + + *pbIsConnected = connection->connected; + return S_OK; +} + +static HRESULT WINAPI connection_GetConnectivity( + INetworkConnection *iface, + NLM_CONNECTIVITY *pConnectivity ) +{ + FIXME( "%p, %p\n", iface, pConnectivity ); + + *pConnectivity = NLM_CONNECTIVITY_IPV4_INTERNET; + return S_OK; +} + +static HRESULT WINAPI connection_GetConnectionId( + INetworkConnection *iface, + GUID *pgdConnectionId ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + TRACE( "%p, %p\n", iface, pgdConnectionId ); + + *pgdConnectionId = connection->id; + return S_OK; +} + +static HRESULT WINAPI connection_GetAdapterId( + INetworkConnection *iface, + GUID *pgdAdapterId ) +{ + struct connection *connection = impl_from_INetworkConnection( iface ); + + FIXME( "%p, %p\n", iface, pgdAdapterId ); + + *pgdAdapterId = connection->id; + return S_OK; +} + +static HRESULT WINAPI connection_GetDomainType( + INetworkConnection *iface, + NLM_DOMAIN_TYPE *pDomainType ) +{ + FIXME( "%p, %p\n", iface, pDomainType ); + + *pDomainType = NLM_DOMAIN_TYPE_NON_DOMAIN_NETWORK; + return S_OK; +} + +static const struct INetworkConnectionVtbl connection_vtbl = +{ + connection_QueryInterface, + connection_AddRef, + connection_Release, + connection_GetTypeInfoCount, + connection_GetTypeInfo, + connection_GetIDsOfNames, + connection_Invoke, + connection_GetNetwork, + connection_get_IsConnectedToInternet, + connection_get_IsConnected, + connection_GetConnectivity, + connection_GetConnectionId, + connection_GetAdapterId, + connection_GetDomainType +}; + +static struct connection *create_connection( const GUID *id ) +{ + struct connection *ret; + + if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; + + ret->INetworkConnection_iface.lpVtbl = &connection_vtbl; + ret->refs = 1; + ret->id = *id; + ret->connected = VARIANT_FALSE; + ret->connected_to_internet = VARIANT_FALSE; + list_init( &ret->entry ); + + return ret; +} + +static void init_networks( struct list_manager *mgr ) +{ + DWORD size = 0; + IP_ADAPTER_ADDRESSES *buf, *aa; + GUID id; + ULONG ret, flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | + GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_INCLUDE_ALL_GATEWAYS; + + list_init( &mgr->connections ); + + ret = GetAdaptersAddresses( WS_AF_UNSPEC, flags, NULL, NULL, &size ); + if (ret != ERROR_BUFFER_OVERFLOW) return; + + if (!(buf = heap_alloc( size ))) return; + if (GetAdaptersAddresses( WS_AF_UNSPEC, flags, NULL, buf, &size )) return; + + memset( &id, 0, sizeof(id) ); + for (aa = buf; aa; aa = aa->Next) + { + struct connection *connection; + + id.Data1 = aa->IfIndex; + + if (!(connection = create_connection( &id ))) + goto done; + + if (aa->FirstUnicastAddress) + { + connection->connected = VARIANT_TRUE; + } + if (aa->FirstGatewayAddress) + { + connection->connected_to_internet = VARIANT_TRUE; + } + + list_add_tail( &mgr->connections, &connection->entry ); + } + +done: + heap_free( buf ); +} + HRESULT list_manager_create( void **obj ) { struct list_manager *mgr; @@ -593,6 +865,7 @@ HRESULT list_manager_create( void **obj ) mgr->INetworkListManager_iface.lpVtbl = &list_manager_vtbl; mgr->INetworkCostManager_iface.lpVtbl = &cost_manager_vtbl; mgr->IConnectionPointContainer_iface.lpVtbl = &cpc_vtbl; + init_networks( mgr ); mgr->refs = 1; *obj = &mgr->INetworkListManager_iface;

1 0

Gerald Pfeifer : include: Base D3DVSD_TOKENTYPEMASK on an unsigned constant to avoid avoid shift overflows.
by Alexandre Julliard Aug. 27, 2015

Aug. 27, 2015

Module: wine Branch: master Commit: 46365d4873b89e266cfd36709885feed7a1c3a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46365d4873b89e266cfd36709… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Aug 27 00:10:39 2015 +0200 include: Base D3DVSD_TOKENTYPEMASK on an unsigned constant to avoid avoid shift overflows. --- include/d3d8types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3d8types.h b/include/d3d8types.h index 0ffa2db..9592544 100644 --- a/include/d3d8types.h +++ b/include/d3d8types.h @@ -263,7 +263,7 @@ typedef enum _D3DVSDT_TYPE { #define D3DVSD_CONSTCOUNTMASK (0xF << D3DVSD_CONSTCOUNTSHIFT) #define D3DVSD_DATALOADTYPEMASK (0x1 << D3DVSD_DATALOADTYPESHIFT) #define D3DVSD_STREAMTESSMASK (0x1 << D3DVSD_STREAMTESSSHIFT) -#define D3DVSD_TOKENTYPEMASK (0x7 << D3DVSD_TOKENTYPESHIFT) +#define D3DVSD_TOKENTYPEMASK (0x7u << D3DVSD_TOKENTYPESHIFT) #define D3DVSD_MAKETOKENTYPE(TokenType) \

1 0

Hans Leidekker : netprofm: Introduce heap allocation macros.
by Alexandre Julliard Aug. 27, 2015

Aug. 27, 2015

Module: wine Branch: master Commit: 346dd728fb1b2331a2f250d11e35ba6ecf802661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=346dd728fb1b2331a2f250d11… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 27 15:03:48 2015 +0200 netprofm: Introduce heap allocation macros. --- dlls/netprofm/list.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 245f7f4..cd51d37 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -40,6 +40,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(netprofm); +static inline void *heap_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline BOOL heap_free( void *mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} + struct list_manager { INetworkListManager INetworkListManager_iface; @@ -111,7 +121,7 @@ static ULONG WINAPI connection_point_Release( { TRACE( "destroying %p\n", cp ); IConnectionPointContainer_Release( cp->container ); - HeapFree( GetProcessHeap(), 0, cp ); + heap_free( cp ); } return refs; } @@ -199,7 +209,7 @@ static HRESULT connection_point_create( struct connection_point *cp; TRACE( "%p, %s, %p\n", obj, debugstr_guid(riid), container ); - if (!(cp = HeapAlloc( GetProcessHeap(), 0, sizeof(*cp) ))) return E_OUTOFMEMORY; + if (!(cp = heap_alloc( sizeof(*cp) ))) return E_OUTOFMEMORY; cp->IConnectionPoint_iface.lpVtbl = &connection_point_vtbl; cp->container = container; cp->refs = 1; @@ -348,7 +358,7 @@ static ULONG WINAPI list_manager_Release( if (!refs) { TRACE( "destroying %p\n", mgr ); - HeapFree( GetProcessHeap(), 0, mgr ); + heap_free( mgr ); } return refs; } @@ -576,7 +586,7 @@ HRESULT list_manager_create( void **obj ) TRACE( "%p\n", obj ); - if (!(mgr = HeapAlloc( GetProcessHeap(), 0, sizeof(*mgr) ))) return E_OUTOFMEMORY; + if (!(mgr = heap_alloc( sizeof(*mgr) ))) return E_OUTOFMEMORY; mgr->INetworkListManager_iface.lpVtbl = &list_manager_vtbl; mgr->INetworkCostManager_iface.lpVtbl = &cost_manager_vtbl; mgr->IConnectionPointContainer_iface.lpVtbl = &cpc_vtbl;

1 0

Hans Leidekker : netprofm: Clear the object pointer on failure in QueryInterface.
by Alexandre Julliard Aug. 27, 2015

Aug. 27, 2015

Module: wine Branch: master Commit: 981460e84a5c82982a82971f3954f27393cdb126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=981460e84a5c82982a82971f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 27 15:04:07 2015 +0200 netprofm: Clear the object pointer on failure in QueryInterface. --- dlls/netprofm/list.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index cd51d37..ee0f7b7 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -99,6 +99,7 @@ static HRESULT WINAPI connection_point_QueryInterface( else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + *obj = NULL; return E_NOINTERFACE; } IConnectionPoint_AddRef( iface ); @@ -388,6 +389,7 @@ static HRESULT WINAPI list_manager_QueryInterface( else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + *obj = NULL; return E_NOINTERFACE; } INetworkListManager_AddRef( iface );

1 0

Stefan Dösinger : d3d8/tests: Test presentation parameter combinations.
by Alexandre Julliard Aug. 27, 2015

Aug. 27, 2015

Module: wine Branch: master Commit: 93ed5d3ba3ef93d1ff70454ca0bbb87ac83dd495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93ed5d3ba3ef93d1ff70454ca… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 26 21:50:58 2015 +0200 d3d8/tests: Test presentation parameter combinations. --- dlls/d3d8/tests/device.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index d7400e7..660e202 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7249,6 +7249,153 @@ static void test_resource_priority(void) DestroyWindow(window); } +static void test_swapchain_parameters(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + IDirect3DSurface8 *backbuffer; + HWND window; + HRESULT hr; + unsigned int i, j; + D3DPRESENT_PARAMETERS present_parameters, present_parameters_windowed = {0}; + static const struct + { + BOOL windowed; + UINT backbuffer_count; + D3DSWAPEFFECT swap_effect; + HRESULT hr; + } + tests[] = + { + /* Swap effect 0 is not allowed. */ + {TRUE, 1, 0, D3DERR_INVALIDCALL}, + {FALSE, 1, 0, D3DERR_INVALIDCALL}, + + /* All (non-ex) swap effects are allowed in + * windowed and fullscreen mode. */ + {TRUE, 1, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {TRUE, 1, D3DSWAPEFFECT_FLIP, D3D_OK}, + {FALSE, 1, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {FALSE, 1, D3DSWAPEFFECT_FLIP, D3D_OK}, + {FALSE, 1, D3DSWAPEFFECT_COPY, D3D_OK}, + + /* Only one backbuffer in copy mode. Reset allows it for + * some reason. */ + {TRUE, 0, D3DSWAPEFFECT_COPY, D3D_OK}, + {TRUE, 1, D3DSWAPEFFECT_COPY, D3D_OK}, + {TRUE, 2, D3DSWAPEFFECT_COPY, D3DERR_INVALIDCALL}, + {FALSE, 2, D3DSWAPEFFECT_COPY, D3DERR_INVALIDCALL}, + + /* Ok with the others, in fullscreen and windowed mode. */ + {TRUE, 2, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {TRUE, 2, D3DSWAPEFFECT_FLIP, D3D_OK}, + {FALSE, 2, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {FALSE, 2, D3DSWAPEFFECT_FLIP, D3D_OK}, + + /* 3 is the highest allowed backbuffer count. */ + {TRUE, 3, D3DSWAPEFFECT_DISCARD, D3D_OK}, + {TRUE, 4, D3DSWAPEFFECT_DISCARD, D3DERR_INVALIDCALL}, + {TRUE, 4, D3DSWAPEFFECT_FLIP, D3DERR_INVALIDCALL}, + {FALSE, 4, D3DSWAPEFFECT_DISCARD, D3DERR_INVALIDCALL}, + {FALSE, 4, D3DSWAPEFFECT_FLIP, D3DERR_INVALIDCALL}, + }; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + IDirect3DDevice8_Release(device); + + present_parameters_windowed.BackBufferWidth = registry_mode.dmPelsWidth; + present_parameters_windowed.BackBufferHeight = registry_mode.dmPelsHeight; + present_parameters_windowed.hDeviceWindow = window; + present_parameters_windowed.BackBufferFormat = D3DFMT_X8R8G8B8; + present_parameters_windowed.SwapEffect = D3DSWAPEFFECT_COPY; + present_parameters_windowed.Windowed = TRUE; + present_parameters_windowed.BackBufferCount = 1; + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + UINT bb_count = tests[i].backbuffer_count ? tests[i].backbuffer_count : 1; + + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; + present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; + present_parameters.hDeviceWindow = window; + present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; + + present_parameters.SwapEffect = tests[i].swap_effect; + present_parameters.Windowed = tests[i].windowed; + present_parameters.BackBufferCount = tests[i].backbuffer_count; + + hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); + ok(hr == tests[i].hr, "Expected hr %x, got %x, test %u.\n", tests[i].hr, hr, i); + if (SUCCEEDED(hr)) + { + for (j = 0; j < bb_count; ++j) + { + hr = IDirect3DDevice8_GetBackBuffer(device, j, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get backbuffer %u, hr %#x, test %u.\n", j, hr, i); + IDirect3DSurface8_Release(backbuffer); + } + hr = IDirect3DDevice8_GetBackBuffer(device, j, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %x, test %u.\n", hr, i); + + IDirect3DDevice8_Release(device); + } + + hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters_windowed, &device); + ok(SUCCEEDED(hr), "Failed to create device, hr %#x, test %u.\n", hr, i); + + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; + present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; + present_parameters.hDeviceWindow = window; + present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; + + present_parameters.SwapEffect = tests[i].swap_effect; + present_parameters.Windowed = tests[i].windowed; + present_parameters.BackBufferCount = tests[i].backbuffer_count; + + hr = IDirect3DDevice8_Reset(device, &present_parameters); + ok(hr == tests[i].hr, "Expected hr %x, got %x, test %u.\n", tests[i].hr, hr, i); + + if (FAILED(hr)) + { + hr = IDirect3DDevice8_Reset(device, &present_parameters_windowed); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x, test %u.\n", hr, i); + } + else + { + for (j = 0; j < bb_count; ++j) + { + hr = IDirect3DDevice8_GetBackBuffer(device, j, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + if (j) + todo_wine ok(SUCCEEDED(hr), "Failed to get backbuffer %u, hr %#x, test %u.\n", j, hr, i); + else + ok(SUCCEEDED(hr), "Failed to get backbuffer %u, hr %#x, test %u.\n", j, hr, i); + if (SUCCEEDED(hr)) + IDirect3DSurface8_Release(backbuffer); + } + hr = IDirect3DDevice8_GetBackBuffer(device, j, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %x, test %u.\n", hr, i); + } + IDirect3DDevice8_Release(device); + } + + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -7347,6 +7494,7 @@ START_TEST(device) test_writeonly_resource(); test_lost_device(); test_resource_priority(); + test_swapchain_parameters(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Hans Leidekker : include: Add missing Network List Manager declarations.
by Alexandre Julliard Aug. 27, 2015

Aug. 27, 2015

Module: wine Branch: master Commit: 8e90ff68c7bbd26d73241d0719d64f0b8edb1299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e90ff68c7bbd26d73241d071… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 27 15:03:19 2015 +0200 include: Add missing Network List Manager declarations. --- include/netlistmgr.idl | 193 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+) diff --git a/include/netlistmgr.idl b/include/netlistmgr.idl index e6328f4..e098f72 100644 --- a/include/netlistmgr.idl +++ b/include/netlistmgr.idl @@ -44,6 +44,13 @@ typedef [v1_enum] enum NLM_CONNECTIVITY NLM_CONNECTIVITY_IPV6_INTERNET = 0x0400 } NLM_CONNECTIVITY; +typedef [v1_enum] enum NLM_DOMAIN_TYPE +{ + NLM_DOMAIN_TYPE_NON_DOMAIN_NETWORK = 0x00, + NLM_DOMAIN_TYPE_DOMAIN_NETWORK = 0x01, + NLM_DOMAIN_TYPE_DOMAIN_AUTHENTICATED = 0x02 +} NLM_DOMAIN_TYPE; + typedef [v1_enum] enum NLM_ENUM_NETWORK { NLM_ENUM_NETWORK_CONNECTED = 0x01, @@ -112,6 +119,20 @@ interface INetworkCostManager : IUnknown [ object, pointer_default(unique), + uuid(dcb0000a-570f-4a9b-8d69-199fdba5723b) +] +interface INetworkConnectionCost : IUnknown +{ + HRESULT GetCost( + [out] DWORD *pCost); + + HRESULT GetDataPlanStatus( + [out] NLM_DATAPLAN_STATUS *pDataPlanStatus); +} + +[ + object, + pointer_default(unique), uuid(dcb00009-570f-4a9b-8d69-199fdba5723b) ] interface INetworkCostManagerEvents : IUnknown @@ -125,6 +146,68 @@ interface INetworkCostManagerEvents : IUnknown } [ + object, + oleautomation, + pointer_default(unique), + dual, + uuid(dcb00003-570f-4a9b-8d69-199fdba5723b) +] +interface IEnumNetworks : IDispatch +{ + [id(DISPID_NEWENUM), propget, hidden, restricted] + HRESULT _NewEnum( + [out, retval] IEnumVARIANT **ppEnumVar); + + [id(1)] + HRESULT Next( + [in] ULONG celt, + [out, size_is(celt), length_is(*pceltFetched)] INetwork **rgelt, + [in, out] ULONG *pceltFetched); + + [id(2)] + HRESULT Skip( + [in] ULONG celt); + + [id(3)] + HRESULT Reset(); + + [id(4)] + HRESULT Clone( + [out, retval] IEnumNetworks **ppEnumNetwork); +} + +[ + object, + oleautomation, + pointer_default(unique), + dual, + uuid(dcb00006-570f-4a9b-8d69-199fdba5723b) +] +interface IEnumNetworkConnections : IDispatch +{ + [id(DISPID_NEWENUM), propget, hidden, restricted] + HRESULT _NewEnum( + [out, retval] IEnumVARIANT **ppEnumVar); + + [id(1)] + HRESULT Next( + [in] ULONG celt, + [out, size_is(celt), length_is(*pceltFetched)] INetworkConnection **rgelt, + [in, out] ULONG *pceltFetched); + + [id(2)] + HRESULT Skip( + [in] ULONG celt); + + [id(3)] + HRESULT Reset(); + + [id(4)] + HRESULT Clone( + [out, retval] IEnumNetworkConnections **ppEnumNetwork); +} + +[ dual, object, oleautomation, @@ -197,3 +280,113 @@ interface INetworkConnectionEvents : IUnknown [in] GUID connectionId, [in] NLM_CONNECTION_PROPERTY_CHANGE flags); } + +[ + object, + oleautomation, + pointer_default(unique), + dual, + uuid(dcb00005-570f-4a9b-8d69-199fdba5723b) +] +interface INetworkConnection : IDispatch +{ + [id(1)] + HRESULT GetNetwork( + [out, retval] INetwork **ppNetwork); + + [propget, id(2)] + HRESULT IsConnectedToInternet( + [out, retval] VARIANT_BOOL *pbIsConnected); + + [propget, id(3)] + HRESULT IsConnected( + [out, retval] VARIANT_BOOL *pbIsConnected); + + [id(4)] + HRESULT GetConnectivity( + [out, retval] NLM_CONNECTIVITY *pConnectivity); + + [id(5)] + HRESULT GetConnectionId( + [out, retval] GUID *pgdConnectionId); + + [id(6)] + HRESULT GetAdapterId( + [out, retval] GUID *pgdAdapterId); + + [id(7)] + HRESULT GetDomainType( + [out, retval] NLM_DOMAIN_TYPE *pDomainType); +} + +[ + object, + oleautomation, + pointer_default(unique), + dual, + uuid(dcb00002-570f-4a9b-8d69-199fdba5723b) +] +interface INetwork : IDispatch +{ + typedef enum NLM_NETWORK_CATEGORY + { + NLM_NETWORK_CATEGORY_PUBLIC = 0x00, + NLM_NETWORK_CATEGORY_PRIVATE = 0x01, + NLM_NETWORK_CATEGORY_DOMAIN_AUTHENTICATED = 0x02 + } NLM_NETWORK_CATEGORY; + + [id(1)] + HRESULT GetName( + [out, string, retval] BSTR *pszNetworkName); + + [id(2)] + HRESULT SetName( + [in, string] BSTR szNetworkNewName); + + [id(3)] + HRESULT GetDescription( + [out, string, retval] BSTR *pszDescription); + + [id(4)] + HRESULT SetDescription( + [in, string] BSTR szDescription); + + [id(5)] + HRESULT GetNetworkId( + [out, retval] GUID *pgdGuidNetworkId); + + [id(6)] + HRESULT GetDomainType( + [out, retval] NLM_DOMAIN_TYPE *pNetworkType); + + [id(7)] + HRESULT GetNetworkConnections( + [out, retval] IEnumNetworkConnections **ppEnumNetworkConnection); + + [id(8)] + HRESULT GetTimeCreatedAndConnected( + [out] DWORD *pdwLowDateTimeCreated, + [out] DWORD *pdwHighDateTimeCreated, + [out] DWORD *pdwLowDateTimeConnected, + [out] DWORD *pdwHighDateTimeConnected); + + [propget, id(9)] + HRESULT IsConnectedToInternet( + [out, retval] VARIANT_BOOL *pbIsConnected); + + [propget, id(10)] + HRESULT IsConnected( + [out, retval] VARIANT_BOOL *pbIsConnected); + + [id(11)] + HRESULT GetConnectivity( + [out, retval] NLM_CONNECTIVITY *pConnectivity); + + [id(12)] + HRESULT GetCategory( + [out, retval] NLM_NETWORK_CATEGORY *pCategory); + + [id(13)] + HRESULT SetCategory( + [in] NLM_NETWORK_CATEGORY NewCategory); +}

1 0