September 2015 - Wine-Commits

Hans Leidekker : netprofm: Add a stub implementation of INetwork.
by Alexandre Julliard Sept. 2, 2015

Sept. 2, 2015

Module: wine Branch: master Commit: 6defcbe3d9fc641e38908adac563540494f1b084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6defcbe3d9fc641e38908adac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 2 10:42:08 2015 +0200 netprofm: Add a stub implementation of INetwork. --- dlls/netprofm/list.c | 292 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 292 insertions(+) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index b39856d..6afe13e 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -51,6 +51,16 @@ static inline BOOL heap_free( void *mem ) return HeapFree( GetProcessHeap(), 0, mem ); } +struct network +{ + INetwork INetwork_iface; + LONG refs; + struct list entry; + GUID id; + VARIANT_BOOL connected_to_internet; + VARIANT_BOOL connected; +}; + struct connection { INetworkConnection INetworkConnection_iface; @@ -67,6 +77,7 @@ struct list_manager INetworkCostManager INetworkCostManager_iface; IConnectionPointContainer IConnectionPointContainer_iface; LONG refs; + struct list networks; struct list connections; }; @@ -235,6 +246,271 @@ static HRESULT connection_point_create( return S_OK; } +static inline struct network *impl_from_INetwork( + INetwork *iface ) +{ + return CONTAINING_RECORD( iface, struct network, INetwork_iface ); +} + +static HRESULT WINAPI network_QueryInterface( + INetwork *iface, REFIID riid, void **obj ) +{ + struct network *network = impl_from_INetwork( iface ); + + TRACE( "%p, %s, %p\n", network, debugstr_guid(riid), obj ); + + if (IsEqualIID( riid, &IID_INetwork ) || + IsEqualIID( riid, &IID_IDispatch ) || + IsEqualIID( riid, &IID_IUnknown )) + { + *obj = iface; + INetwork_AddRef( iface ); + return S_OK; + } + else + { + WARN( "interface not supported %s\n", debugstr_guid(riid) ); + *obj = NULL; + return E_NOINTERFACE; + } +} + +static ULONG WINAPI network_AddRef( + INetwork *iface ) +{ + struct network *network = impl_from_INetwork( iface ); + + TRACE( "%p\n", network ); + return InterlockedIncrement( &network->refs ); +} + +static ULONG WINAPI network_Release( + INetwork *iface ) +{ + struct network *network = impl_from_INetwork( iface ); + LONG refs; + + TRACE( "%p\n", network ); + + if (!(refs = InterlockedDecrement( &network->refs ))) + { + list_remove( &network->entry ); + heap_free( network ); + } + return refs; +} + +static HRESULT WINAPI network_GetTypeInfoCount( + INetwork *iface, + UINT *count ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI network_GetTypeInfo( + INetwork *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI network_GetIDsOfNames( + INetwork *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI network_Invoke( + INetwork *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 network_GetName( + INetwork *iface, + BSTR *pszNetworkName ) +{ + FIXME( "%p, %p\n", iface, pszNetworkName ); + return E_NOTIMPL; +} + +static HRESULT WINAPI network_SetName( + INetwork *iface, + BSTR szNetworkNewName ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(szNetworkNewName) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI network_GetDescription( + INetwork *iface, + BSTR *pszDescription ) +{ + FIXME( "%p, %p\n", iface, pszDescription ); + return E_NOTIMPL; +} + +static HRESULT WINAPI network_SetDescription( + INetwork *iface, + BSTR szDescription ) +{ + FIXME( "%p, %s\n", iface, debugstr_w(szDescription) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI network_GetNetworkId( + INetwork *iface, + GUID *pgdGuidNetworkId ) +{ + struct network *network = impl_from_INetwork( iface ); + + TRACE( "%p, %p\n", iface, pgdGuidNetworkId ); + + *pgdGuidNetworkId = network->id; + return S_OK; +} + +static HRESULT WINAPI network_GetDomainType( + INetwork *iface, + NLM_DOMAIN_TYPE *pDomainType ) +{ + FIXME( "%p, %p\n", iface, pDomainType ); + + *pDomainType = NLM_DOMAIN_TYPE_NON_DOMAIN_NETWORK; + return S_OK; +} + +static HRESULT WINAPI network_GetNetworkConnections( + INetwork *iface, + IEnumNetworkConnections **ppEnumNetworkConnection ) +{ + FIXME( "%p, %p\n", iface, ppEnumNetworkConnection ); + return E_NOTIMPL; +} + +static HRESULT WINAPI network_GetTimeCreatedAndConnected( + INetwork *iface, + DWORD *pdwLowDateTimeCreated, + DWORD *pdwHighDateTimeCreated, + DWORD *pdwLowDateTimeConnected, + DWORD *pdwHighDateTimeConnected ) +{ + FIXME( "%p, %p, %p, %p, %p\n", iface, pdwLowDateTimeCreated, pdwHighDateTimeCreated, + pdwLowDateTimeConnected, pdwHighDateTimeConnected ); + return E_NOTIMPL; +} + +static HRESULT WINAPI network_get_IsConnectedToInternet( + INetwork *iface, + VARIANT_BOOL *pbIsConnected ) +{ + struct network *network = impl_from_INetwork( iface ); + + TRACE( "%p, %p\n", iface, pbIsConnected ); + + *pbIsConnected = network->connected_to_internet; + return S_OK; +} + +static HRESULT WINAPI network_get_IsConnected( + INetwork *iface, + VARIANT_BOOL *pbIsConnected ) +{ + struct network *network = impl_from_INetwork( iface ); + + TRACE( "%p, %p\n", iface, pbIsConnected ); + + *pbIsConnected = network->connected; + return S_OK; +} + +static HRESULT WINAPI network_GetConnectivity( + INetwork *iface, + NLM_CONNECTIVITY *pConnectivity ) +{ + FIXME( "%p, %p\n", iface, pConnectivity ); + + *pConnectivity = NLM_CONNECTIVITY_IPV4_INTERNET; + return S_OK; +} + +static HRESULT WINAPI network_GetCategory( + INetwork *iface, + NLM_NETWORK_CATEGORY *pCategory ) +{ + FIXME( "%p, %p\n", iface, pCategory ); + + *pCategory = NLM_NETWORK_CATEGORY_PUBLIC; + return S_OK; +} + +static HRESULT WINAPI network_SetCategory( + INetwork *iface, + NLM_NETWORK_CATEGORY NewCategory ) +{ + FIXME( "%p, %u\n", iface, NewCategory ); + return E_NOTIMPL; +} + +static const struct INetworkVtbl network_vtbl = +{ + network_QueryInterface, + network_AddRef, + network_Release, + network_GetTypeInfoCount, + network_GetTypeInfo, + network_GetIDsOfNames, + network_Invoke, + network_GetName, + network_SetName, + network_GetDescription, + network_SetDescription, + network_GetNetworkId, + network_GetDomainType, + network_GetNetworkConnections, + network_GetTimeCreatedAndConnected, + network_get_IsConnectedToInternet, + network_get_IsConnected, + network_GetConnectivity, + network_GetCategory, + network_SetCategory +}; + +static struct network *create_network( const GUID *id ) +{ + struct network *ret; + + if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; + + ret->INetwork_iface.lpVtbl = &network_vtbl; + ret->refs = 1; + ret->id = *id; + ret->connected = VARIANT_FALSE; + ret->connected_to_internet = VARIANT_FALSE; + list_init( &ret->entry ); + + return ret; +} + static HRESULT WINAPI cost_manager_QueryInterface( INetworkCostManager *iface, REFIID riid, @@ -374,6 +650,12 @@ static ULONG WINAPI list_manager_Release( TRACE( "destroying %p\n", mgr ); + while ((ptr = list_head( &mgr->networks ))) + { + struct network *network = LIST_ENTRY( ptr, struct network, entry ); + list_remove( &network->entry ); + INetwork_Release( &network->INetwork_iface ); + } while ((ptr = list_head( &mgr->connections ))) { struct connection *connection = LIST_ENTRY( ptr, struct connection, entry ); @@ -821,6 +1103,7 @@ static void init_networks( struct list_manager *mgr ) ULONG ret, flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_INCLUDE_ALL_GATEWAYS; + list_init( &mgr->networks ); list_init( &mgr->connections ); ret = GetAdaptersAddresses( WS_AF_UNSPEC, flags, NULL, NULL, &size ); @@ -832,22 +1115,31 @@ static void init_networks( struct list_manager *mgr ) memset( &id, 0, sizeof(id) ); for (aa = buf; aa; aa = aa->Next) { + struct network *network; struct connection *connection; id.Data1 = aa->IfIndex; + /* assume a one-to-one mapping between networks and connections */ + if (!(network = create_network( &id ))) goto done; if (!(connection = create_connection( &id ))) + { + INetwork_Release( &network->INetwork_iface ); goto done; + } if (aa->FirstUnicastAddress) { + network->connected = VARIANT_TRUE; connection->connected = VARIANT_TRUE; } if (aa->FirstGatewayAddress) { + network->connected_to_internet = VARIANT_TRUE; connection->connected_to_internet = VARIANT_TRUE; } + list_add_tail( &mgr->networks, &network->entry ); list_add_tail( &mgr->connections, &connection->entry ); }

1 0

Thomas Faller : msxml3: Fix invalid read.
by Alexandre Julliard Sept. 2, 2015

Sept. 2, 2015

Module: wine Branch: master Commit: f259ba33bb4b7f2a4a0bbf70063c4bef3d605709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f259ba33bb4b7f2a4a0bbf700… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Tue Sep 1 14:25:51 2015 +0200 msxml3: Fix invalid read. --- dlls/msxml3/saxreader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 3b5bd7c..2b087bc 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -690,12 +690,13 @@ static void format_error_message_from_id(saxlocator *This, HRESULT hr) static void update_position(saxlocator *This, BOOL fix_column) { const xmlChar *p = This->pParserCtxt->input->cur-1; + const xmlChar *baseP = This->pParserCtxt->input->base; This->line = xmlSAX2GetLineNumber(This->pParserCtxt); if(fix_column) { This->column = 1; - for(; *p!='\n' && *p!='\r' && p>=This->pParserCtxt->input->base; p--) + for(;p>=baseP && *p!='\n' && *p!='\r'; p--) This->column++; } else

1 0

Hans Leidekker : netprofm: Add a stub implementation of INetworkConnectionCost.
by Alexandre Julliard Sept. 2, 2015

Sept. 2, 2015

Module: wine Branch: master Commit: 4cbf0882477de6edf1cfbe1b8400368a35846a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cbf0882477de6edf1cfbe1b8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 2 10:42:49 2015 +0200 netprofm: Add a stub implementation of INetworkConnectionCost. --- dlls/netprofm/list.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 0aaeff8..3909cf2 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -64,6 +64,7 @@ struct network struct connection { INetworkConnection INetworkConnection_iface; + INetworkConnectionCost INetworkConnectionCost_iface; LONG refs; struct list entry; GUID id; @@ -906,6 +907,10 @@ static HRESULT WINAPI connection_QueryInterface( { *obj = iface; } + else if (IsEqualIID( riid, &IID_INetworkConnectionCost )) + { + *obj = &connection->INetworkConnectionCost_iface; + } else { WARN( "interface not supported %s\n", debugstr_guid(riid) ); @@ -1086,6 +1091,77 @@ static const struct INetworkConnectionVtbl connection_vtbl = connection_GetDomainType }; +static inline struct connection *impl_from_INetworkConnectionCost( + INetworkConnectionCost *iface ) +{ + return CONTAINING_RECORD( iface, struct connection, INetworkConnectionCost_iface ); +} + +static HRESULT WINAPI connection_cost_QueryInterface( + INetworkConnectionCost *iface, + REFIID riid, + void **obj ) +{ + struct connection *conn = impl_from_INetworkConnectionCost( iface ); + return INetworkConnection_QueryInterface( &conn->INetworkConnection_iface, riid, obj ); +} + +static ULONG WINAPI connection_cost_AddRef( + INetworkConnectionCost *iface ) +{ + struct connection *conn = impl_from_INetworkConnectionCost( iface ); + return INetworkConnection_AddRef( &conn->INetworkConnection_iface ); +} + +static ULONG WINAPI connection_cost_Release( + INetworkConnectionCost *iface ) +{ + struct connection *conn = impl_from_INetworkConnectionCost( iface ); + return INetworkConnection_Release( &conn->INetworkConnection_iface ); +} + +static HRESULT WINAPI connection_cost_GetCost( + INetworkConnectionCost *iface, DWORD *pCost ) +{ + FIXME( "%p, %p\n", iface, pCost ); + + if (!pCost) return E_POINTER; + + *pCost = NLM_CONNECTION_COST_UNRESTRICTED; + return S_OK; +} + +static HRESULT WINAPI connection_cost_GetDataPlanStatus( + INetworkConnectionCost *iface, NLM_DATAPLAN_STATUS *pDataPlanStatus ) +{ + struct connection *conn = impl_from_INetworkConnectionCost( iface ); + + FIXME( "%p, %p\n", iface, pDataPlanStatus ); + + if (!pDataPlanStatus) return E_POINTER; + + memcpy( &pDataPlanStatus->InterfaceGuid, &conn->id, sizeof(conn->id) ); + pDataPlanStatus->UsageData.UsageInMegabytes = NLM_UNKNOWN_DATAPLAN_STATUS; + memset( &pDataPlanStatus->UsageData.LastSyncTime, 0, sizeof(pDataPlanStatus->UsageData.LastSyncTime) ); + pDataPlanStatus->DataLimitInMegabytes = NLM_UNKNOWN_DATAPLAN_STATUS; + pDataPlanStatus->InboundBandwidthInKbps = NLM_UNKNOWN_DATAPLAN_STATUS; + pDataPlanStatus->OutboundBandwidthInKbps = NLM_UNKNOWN_DATAPLAN_STATUS; + memset( &pDataPlanStatus->NextBillingCycle, 0, sizeof(pDataPlanStatus->NextBillingCycle) ); + pDataPlanStatus->MaxTransferSizeInMegabytes = NLM_UNKNOWN_DATAPLAN_STATUS; + pDataPlanStatus->Reserved = 0; + + return S_OK; +} + +static const INetworkConnectionCostVtbl connection_cost_vtbl = +{ + connection_cost_QueryInterface, + connection_cost_AddRef, + connection_cost_Release, + connection_cost_GetCost, + connection_cost_GetDataPlanStatus +}; + static struct connection *create_connection( const GUID *id ) { struct connection *ret; @@ -1093,6 +1169,7 @@ static struct connection *create_connection( const GUID *id ) if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; ret->INetworkConnection_iface.lpVtbl = &connection_vtbl; + ret->INetworkConnectionCost_iface.lpVtbl = &connection_cost_vtbl; ret->refs = 1; ret->id = *id; ret->network = NULL;

1 0

Hans Leidekker : netprofm: Implement INetworkListManager:: GetNetworkConnection.
by Alexandre Julliard Sept. 2, 2015

Sept. 2, 2015

Module: wine Branch: master Commit: a0085f70a4cdac8a1943c16cc80b584a5eee269f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0085f70a4cdac8a1943c16cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 2 10:44:11 2015 +0200 netprofm: Implement INetworkListManager::GetNetworkConnection. --- dlls/netprofm/list.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 1871bd9..e7d8264 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -1226,9 +1226,23 @@ static HRESULT WINAPI list_manager_GetNetworkConnection( GUID gdNetworkConnectionId, INetworkConnection **ppNetworkConnection ) { - FIXME( "%p, %s, %p\n", iface, debugstr_guid(&gdNetworkConnectionId), + struct list_manager *mgr = impl_from_INetworkListManager( iface ); + struct connection *connection; + + TRACE( "%p, %s, %p\n", iface, debugstr_guid(&gdNetworkConnectionId), ppNetworkConnection ); - return E_NOTIMPL; + + LIST_FOR_EACH_ENTRY( connection, &mgr->connections, struct connection, entry ) + { + if (IsEqualGUID( &connection->id, &gdNetworkConnectionId )) + { + *ppNetworkConnection = &connection->INetworkConnection_iface; + INetworkConnection_AddRef( *ppNetworkConnection ); + return S_OK; + } + } + + return S_FALSE; } static HRESULT WINAPI list_manager_IsConnectedToInternet(

1 0

Hans Leidekker : netprofm: Implement INetworkListManager::GetNetwork.
by Alexandre Julliard Sept. 2, 2015

Sept. 2, 2015

Module: wine Branch: master Commit: 25886fa827c78d84c2d8629fc7bc0eeabde135e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25886fa827c78d84c2d8629fc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 2 10:43:50 2015 +0200 netprofm: Implement INetworkListManager::GetNetwork. --- dlls/netprofm/list.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index d3b536d..1871bd9 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -1193,8 +1193,22 @@ static HRESULT WINAPI list_manager_GetNetwork( GUID gdNetworkId, INetwork **ppNetwork ) { - FIXME( "%p, %s, %p\n", iface, debugstr_guid(&gdNetworkId), ppNetwork ); - return E_NOTIMPL; + struct list_manager *mgr = impl_from_INetworkListManager( iface ); + struct network *network; + + TRACE( "%p, %s, %p\n", iface, debugstr_guid(&gdNetworkId), ppNetwork ); + + LIST_FOR_EACH_ENTRY( network, &mgr->networks, struct network, entry ) + { + if (IsEqualGUID( &network->id, &gdNetworkId )) + { + *ppNetwork = &network->INetwork_iface; + INetwork_AddRef( *ppNetwork ); + return S_OK; + } + } + + return S_FALSE; } static HRESULT WINAPI list_manager_GetNetworkConnections(

1 0

Thomas Faber : kernel32/tests: Run test_thread_fpu_cw on x86 MSVC builds.
by Alexandre Julliard Sept. 2, 2015

Sept. 2, 2015

Module: wine Branch: master Commit: 9165dbbffcffc959e148be633d2b4693cec006b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9165dbbffcffc959e148be633… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Sep 1 16:14:54 2015 +0200 kernel32/tests: Run test_thread_fpu_cw on x86 MSVC builds. --- dlls/kernel32/tests/thread.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 2e1614c..d0fbfa4 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1408,16 +1408,25 @@ static void test_ThreadErrorMode(void) pSetThreadErrorMode(oldmode, NULL); } -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))) || (defined(_MSC_VER) && defined(__i386__)) static inline void set_fpu_cw(WORD cw) { +#ifdef _MSC_VER + __asm { fnclex } + __asm { fldcw [cw] } +#else __asm__ volatile ("fnclex; fldcw %0" : : "m" (cw)); +#endif } static inline WORD get_fpu_cw(void) { WORD cw = 0; +#ifdef _MSC_VER + __asm { fnstcw [cw] } +#else __asm__ volatile ("fnstcw %0" : "=m" (cw)); +#endif return cw; } @@ -1888,7 +1897,7 @@ START_TEST(thread) test_RegisterWaitForSingleObject(); test_TLS(); test_ThreadErrorMode(); -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))) || (defined(_MSC_VER) && defined(__i386__)) test_thread_fpu_cw(); #endif test_thread_actctx();

1 0

Sebastian Lackner : include: Fix copy and paste errors in wine_dbgstr_vt.
by Alexandre Julliard Sept. 2, 2015

Sept. 2, 2015

Module: wine Branch: master Commit: 615ef9855561200678e541ec43d8afac026810ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=615ef9855561200678e541ec4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 1 14:59:38 2015 +0200 include: Fix copy and paste errors in wine_dbgstr_vt. --- include/wine/debug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 95d74d3..241e79b 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -244,7 +244,7 @@ static inline const char *wine_dbgstr_vt( VARTYPE vt ) "|VT_ARRAY", "|VT_VECTOR|VT_ARRAY", "|VT_BYREF", - "|VT_VECTOR|VT_ARRAY", + "|VT_VECTOR|VT_BYREF", "|VT_ARRAY|VT_BYREF", "|VT_VECTOR|VT_ARRAY|VT_BYREF", "|VT_RESERVED", @@ -252,7 +252,7 @@ static inline const char *wine_dbgstr_vt( VARTYPE vt ) "|VT_ARRAY|VT_RESERVED", "|VT_VECTOR|VT_ARRAY|VT_RESERVED", "|VT_BYREF|VT_RESERVED", - "|VT_VECTOR|VT_ARRAY|VT_RESERVED", + "|VT_VECTOR|VT_BYREF|VT_RESERVED", "|VT_ARRAY|VT_BYREF|VT_RESERVED", "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_RESERVED", };

1 0

Hans Leidekker : netprofm: Implement INetworkConnection::GetNetwork.
by Alexandre Julliard Sept. 2, 2015

Sept. 2, 2015

Module: wine Branch: master Commit: 91835d94e9ee5cfc1e29f7354cd331f19d6c3788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91835d94e9ee5cfc1e29f7354… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 2 10:42:29 2015 +0200 netprofm: Implement INetworkConnection::GetNetwork. --- dlls/netprofm/list.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 6afe13e..0aaeff8 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -67,6 +67,7 @@ struct connection LONG refs; struct list entry; GUID id; + INetwork *network; VARIANT_BOOL connected_to_internet; VARIANT_BOOL connected; }; @@ -934,6 +935,7 @@ static ULONG WINAPI connection_Release( if (!(refs = InterlockedDecrement( &connection->refs ))) { + INetwork_Release( connection->network ); list_remove( &connection->entry ); heap_free( connection ); } @@ -989,8 +991,13 @@ static HRESULT WINAPI connection_GetNetwork( INetworkConnection *iface, INetwork **ppNetwork ) { - FIXME( "%p, %p\n", iface, ppNetwork ); - return E_NOTIMPL; + struct connection *connection = impl_from_INetworkConnection( iface ); + + TRACE( "%p, %p\n", iface, ppNetwork ); + + *ppNetwork = connection->network; + INetwork_AddRef( *ppNetwork ); + return S_OK; } static HRESULT WINAPI connection_get_IsConnectedToInternet( @@ -1088,6 +1095,7 @@ static struct connection *create_connection( const GUID *id ) ret->INetworkConnection_iface.lpVtbl = &connection_vtbl; ret->refs = 1; ret->id = *id; + ret->network = NULL; ret->connected = VARIANT_FALSE; ret->connected_to_internet = VARIANT_FALSE; list_init( &ret->entry ); @@ -1139,6 +1147,9 @@ static void init_networks( struct list_manager *mgr ) connection->connected_to_internet = VARIANT_TRUE; } + connection->network = &network->INetwork_iface; + INetwork_AddRef( connection->network ); + list_add_tail( &mgr->networks, &network->entry ); list_add_tail( &mgr->connections, &connection->entry ); }

1 0

Hans Leidekker : netprofm: Implement IEnumNetworks.
by Alexandre Julliard Sept. 2, 2015

Sept. 2, 2015

Module: wine Branch: master Commit: 861cd5a3a7062e197ac636e2f17f327996a99608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=861cd5a3a7062e197ac636e2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 2 10:43:09 2015 +0200 netprofm: Implement IEnumNetworks. --- dlls/netprofm/list.c | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 220 insertions(+), 2 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 3909cf2..42f361f 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -628,6 +628,220 @@ static const INetworkCostManagerVtbl cost_manager_vtbl = cost_manager_SetDestinationAddresses }; +struct networks_enum +{ + IEnumNetworks IEnumNetworks_iface; + LONG refs; + struct list_manager *mgr; + struct list *cursor; +}; + +static inline struct networks_enum *impl_from_IEnumNetworks( + IEnumNetworks *iface ) +{ + return CONTAINING_RECORD( iface, struct networks_enum, IEnumNetworks_iface ); +} + +static HRESULT WINAPI networks_enum_QueryInterface( + IEnumNetworks *iface, REFIID riid, void **obj ) +{ + struct networks_enum *iter = impl_from_IEnumNetworks( iface ); + + TRACE( "%p, %s, %p\n", iter, debugstr_guid(riid), obj ); + + if (IsEqualIID( riid, &IID_IEnumNetworks ) || + IsEqualIID( riid, &IID_IDispatch ) || + IsEqualIID( riid, &IID_IUnknown )) + { + *obj = iface; + IEnumNetworks_AddRef( iface ); + return S_OK; + } + else + { + WARN( "interface not supported %s\n", debugstr_guid(riid) ); + *obj = NULL; + return E_NOINTERFACE; + } +} + +static ULONG WINAPI networks_enum_AddRef( + IEnumNetworks *iface ) +{ + struct networks_enum *iter = impl_from_IEnumNetworks( iface ); + + TRACE( "%p\n", iter ); + return InterlockedIncrement( &iter->refs ); +} + +static ULONG WINAPI networks_enum_Release( + IEnumNetworks *iface ) +{ + struct networks_enum *iter = impl_from_IEnumNetworks( iface ); + LONG refs; + + TRACE( "%p\n", iter ); + + if (!(refs = InterlockedDecrement( &iter->refs ))) + { + INetworkListManager_Release( &iter->mgr->INetworkListManager_iface ); + heap_free( iter ); + } + return refs; +} + +static HRESULT WINAPI networks_enum_GetTypeInfoCount( + IEnumNetworks *iface, + UINT *count ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI networks_enum_GetTypeInfo( + IEnumNetworks *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI networks_enum_GetIDsOfNames( + IEnumNetworks *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI networks_enum_Invoke( + IEnumNetworks *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 networks_enum_get__NewEnum( + IEnumNetworks *iface, IEnumVARIANT **ppEnumVar ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI networks_enum_Next( + IEnumNetworks *iface, ULONG count, INetwork **ret, ULONG *fetched ) +{ + struct networks_enum *iter = impl_from_IEnumNetworks( iface ); + ULONG i = 0; + + TRACE( "%p, %u %p %p\n", iter, count, ret, fetched ); + + if (fetched) *fetched = 0; + if (!count) return S_OK; + + while (iter->cursor && i < count) + { + struct network *network = LIST_ENTRY( iter->cursor, struct network, entry ); + ret[i] = &network->INetwork_iface; + INetwork_AddRef( ret[i] ); + iter->cursor = list_next( &iter->mgr->networks, iter->cursor ); + i++; + } + if (fetched) *fetched = i; + + return i < count ? S_FALSE : S_OK; +} + +static HRESULT WINAPI networks_enum_Skip( + IEnumNetworks *iface, ULONG count ) +{ + struct networks_enum *iter = impl_from_IEnumNetworks( iface ); + + TRACE( "%p, %u\n", iter, count); + + if (!count) return S_OK; + if (!iter->cursor) return S_FALSE; + + while (count--) + { + iter->cursor = list_next( &iter->mgr->networks, iter->cursor ); + if (!iter->cursor) break; + } + + return count ? S_FALSE : S_OK; +} + +static HRESULT WINAPI networks_enum_Reset( + IEnumNetworks *iface ) +{ + struct networks_enum *iter = impl_from_IEnumNetworks( iface ); + + TRACE( "%p\n", iter ); + + iter->cursor = list_head( &iter->mgr->networks ); + return S_OK; +} + +static HRESULT create_networks_enum( + struct list_manager *, IEnumNetworks** ); + +static HRESULT WINAPI networks_enum_Clone( + IEnumNetworks *iface, IEnumNetworks **ret ) +{ + struct networks_enum *iter = impl_from_IEnumNetworks( iface ); + + TRACE( "%p, %p\n", iter, ret ); + return create_networks_enum( iter->mgr, ret ); +} + +static const IEnumNetworksVtbl networks_enum_vtbl = +{ + networks_enum_QueryInterface, + networks_enum_AddRef, + networks_enum_Release, + networks_enum_GetTypeInfoCount, + networks_enum_GetTypeInfo, + networks_enum_GetIDsOfNames, + networks_enum_Invoke, + networks_enum_get__NewEnum, + networks_enum_Next, + networks_enum_Skip, + networks_enum_Reset, + networks_enum_Clone +}; + +static HRESULT create_networks_enum( + struct list_manager *mgr, IEnumNetworks **ret ) +{ + struct networks_enum *iter; + + *ret = NULL; + if (!(iter = heap_alloc( sizeof(*iter) ))) return E_OUTOFMEMORY; + + iter->IEnumNetworks_iface.lpVtbl = &networks_enum_vtbl; + iter->cursor = list_head( &mgr->networks ); + iter->mgr = mgr; + INetworkListManager_AddRef( &mgr->INetworkListManager_iface ); + iter->refs = 1; + + *ret = &iter->IEnumNetworks_iface; + return S_OK; +} + static inline struct list_manager *impl_from_INetworkListManager( INetworkListManager *iface ) { @@ -752,8 +966,12 @@ static HRESULT WINAPI list_manager_GetNetworks( NLM_ENUM_NETWORK Flags, IEnumNetworks **ppEnumNetwork ) { - FIXME( "%p, %x, %p\n", iface, Flags, ppEnumNetwork ); - return E_NOTIMPL; + struct list_manager *mgr = impl_from_INetworkListManager( iface ); + + TRACE( "%p, %x, %p\n", iface, Flags, ppEnumNetwork ); + if (Flags) FIXME( "flags %08x not supported\n", Flags ); + + return create_networks_enum( mgr, ppEnumNetwork ); } static HRESULT WINAPI list_manager_GetNetwork(

1 0

Hans Leidekker : netprofm: Implement IEnumNetworkConnections.
by Alexandre Julliard Sept. 2, 2015

Sept. 2, 2015

Module: wine Branch: master Commit: fd557984fb9bff7392c0bbc9f18a9d9fd1798904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd557984fb9bff7392c0bbc9f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 2 10:43:30 2015 +0200 netprofm: Implement IEnumNetworkConnections. --- dlls/netprofm/list.c | 220 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 218 insertions(+), 2 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 42f361f..d3b536d 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -848,6 +848,220 @@ static inline struct list_manager *impl_from_INetworkListManager( return CONTAINING_RECORD( iface, struct list_manager, INetworkListManager_iface ); } +struct connections_enum +{ + IEnumNetworkConnections IEnumNetworkConnections_iface; + LONG refs; + struct list_manager *mgr; + struct list *cursor; +}; + +static inline struct connections_enum *impl_from_IEnumNetworkConnections( + IEnumNetworkConnections *iface ) +{ + return CONTAINING_RECORD( iface, struct connections_enum, IEnumNetworkConnections_iface ); +} + +static HRESULT WINAPI connections_enum_QueryInterface( + IEnumNetworkConnections *iface, REFIID riid, void **obj ) +{ + struct connections_enum *iter = impl_from_IEnumNetworkConnections( iface ); + + TRACE( "%p, %s, %p\n", iter, debugstr_guid(riid), obj ); + + if (IsEqualIID( riid, &IID_IEnumNetworkConnections ) || + IsEqualIID( riid, &IID_IDispatch ) || + IsEqualIID( riid, &IID_IUnknown )) + { + *obj = iface; + IEnumNetworkConnections_AddRef( iface ); + return S_OK; + } + else + { + WARN( "interface not supported %s\n", debugstr_guid(riid) ); + *obj = NULL; + return E_NOINTERFACE; + } +} + +static ULONG WINAPI connections_enum_AddRef( + IEnumNetworkConnections *iface ) +{ + struct connections_enum *iter = impl_from_IEnumNetworkConnections( iface ); + + TRACE( "%p\n", iter ); + return InterlockedIncrement( &iter->refs ); +} + +static ULONG WINAPI connections_enum_Release( + IEnumNetworkConnections *iface ) +{ + struct connections_enum *iter = impl_from_IEnumNetworkConnections( iface ); + LONG refs; + + TRACE( "%p\n", iter ); + + if (!(refs = InterlockedDecrement( &iter->refs ))) + { + INetworkListManager_Release( &iter->mgr->INetworkListManager_iface ); + heap_free( iter ); + } + return refs; +} + +static HRESULT WINAPI connections_enum_GetTypeInfoCount( + IEnumNetworkConnections *iface, + UINT *count ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI connections_enum_GetTypeInfo( + IEnumNetworkConnections *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI connections_enum_GetIDsOfNames( + IEnumNetworkConnections *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI connections_enum_Invoke( + IEnumNetworkConnections *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 connections_enum_get__NewEnum( + IEnumNetworkConnections *iface, IEnumVARIANT **ppEnumVar ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI connections_enum_Next( + IEnumNetworkConnections *iface, ULONG count, INetworkConnection **ret, ULONG *fetched ) +{ + struct connections_enum *iter = impl_from_IEnumNetworkConnections( iface ); + ULONG i = 0; + + TRACE( "%p, %u %p %p\n", iter, count, ret, fetched ); + + if (fetched) *fetched = 0; + if (!count) return S_OK; + + while (iter->cursor && i < count) + { + struct connection *connection = LIST_ENTRY( iter->cursor, struct connection, entry ); + ret[i] = &connection->INetworkConnection_iface; + INetworkConnection_AddRef( ret[i] ); + iter->cursor = list_next( &iter->mgr->connections, iter->cursor ); + i++; + } + if (fetched) *fetched = i; + + return i < count ? S_FALSE : S_OK; +} + +static HRESULT WINAPI connections_enum_Skip( + IEnumNetworkConnections *iface, ULONG count ) +{ + struct connections_enum *iter = impl_from_IEnumNetworkConnections( iface ); + + TRACE( "%p, %u\n", iter, count); + + if (!count) return S_OK; + if (!iter->cursor) return S_FALSE; + + while (count--) + { + iter->cursor = list_next( &iter->mgr->connections, iter->cursor ); + if (!iter->cursor) break; + } + + return count ? S_FALSE : S_OK; +} + +static HRESULT WINAPI connections_enum_Reset( + IEnumNetworkConnections *iface ) +{ + struct connections_enum *iter = impl_from_IEnumNetworkConnections( iface ); + + TRACE( "%p\n", iter ); + + iter->cursor = list_head( &iter->mgr->connections ); + return S_OK; +} + +static HRESULT create_connections_enum( + struct list_manager *, IEnumNetworkConnections** ); + +static HRESULT WINAPI connections_enum_Clone( + IEnumNetworkConnections *iface, IEnumNetworkConnections **ret ) +{ + struct connections_enum *iter = impl_from_IEnumNetworkConnections( iface ); + + TRACE( "%p, %p\n", iter, ret ); + return create_connections_enum( iter->mgr, ret ); +} + +static const IEnumNetworkConnectionsVtbl connections_enum_vtbl = +{ + connections_enum_QueryInterface, + connections_enum_AddRef, + connections_enum_Release, + connections_enum_GetTypeInfoCount, + connections_enum_GetTypeInfo, + connections_enum_GetIDsOfNames, + connections_enum_Invoke, + connections_enum_get__NewEnum, + connections_enum_Next, + connections_enum_Skip, + connections_enum_Reset, + connections_enum_Clone +}; + +static HRESULT create_connections_enum( + struct list_manager *mgr, IEnumNetworkConnections **ret ) +{ + struct connections_enum *iter; + + *ret = NULL; + if (!(iter = heap_alloc( sizeof(*iter) ))) return E_OUTOFMEMORY; + + iter->IEnumNetworkConnections_iface.lpVtbl = &connections_enum_vtbl; + iter->mgr = mgr; + INetworkListManager_AddRef( &mgr->INetworkListManager_iface ); + iter->cursor = list_head( &iter->mgr->connections ); + iter->refs = 1; + + *ret = &iter->IEnumNetworkConnections_iface; + return S_OK; +} + static ULONG WINAPI list_manager_AddRef( INetworkListManager *iface ) { @@ -987,8 +1201,10 @@ static HRESULT WINAPI list_manager_GetNetworkConnections( INetworkListManager *iface, IEnumNetworkConnections **ppEnum ) { - FIXME( "%p, %p\n", iface, ppEnum ); - return E_NOTIMPL; + struct list_manager *mgr = impl_from_INetworkListManager( iface ); + + TRACE( "%p, %p\n", iface, ppEnum ); + return create_connections_enum( mgr, ppEnum ); } static HRESULT WINAPI list_manager_GetNetworkConnection(

1 0