From 61a1070ec9016e11f409ee637d9fba3946453b85 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 26 Jul 2010 15:39:48 -0700 Subject: [PATCH] nd2/provide: update provider APIs to match latest spec Signed-off-by: Sean Hefty --- trunk/ulp/netdirect2/user/nd_adapter.h | 2 +- trunk/ulp/netdirect2/user/nd_provider.cpp | 6 +++++- trunk/ulp/netdirect2/user/nd_provider.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/trunk/ulp/netdirect2/user/nd_adapter.h b/trunk/ulp/netdirect2/user/nd_adapter.h index 98215707..4210ee37 100644 --- a/trunk/ulp/netdirect2/user/nd_adapter.h +++ b/trunk/ulp/netdirect2/user/nd_adapter.h @@ -74,7 +74,7 @@ public: ~CNDAdapter(); void Delete() {delete this;} static STDMETHODIMP - CreateInstance(CNDProvider *pProvider, UINT64 adapterId, INDAdapter** ppAdapter) + CreateInstance(CNDProvider *pProvider, UINT64 adapterId, VOID** ppAdapter) { HRESULT hr; CNDAdapter *adapter; diff --git a/trunk/ulp/netdirect2/user/nd_provider.cpp b/trunk/ulp/netdirect2/user/nd_provider.cpp index fc7988b5..6f94b71e 100644 --- a/trunk/ulp/netdirect2/user/nd_provider.cpp +++ b/trunk/ulp/netdirect2/user/nd_provider.cpp @@ -163,8 +163,12 @@ ResolveAddress(const struct sockaddr* pAddress, SIZE_T cbAddress, UINT64* pAdapt } STDMETHODIMP CNDProvider:: -OpenAdapter(UINT64 adapterId, INDAdapter** ppAdapter) +OpenAdapter(REFIID iid, UINT64 adapterId, VOID** ppAdapter) { + if (iid != IID_INDAdapter) { + return E_NOINTERFACE; + } + return CNDAdapter::CreateInstance(this, adapterId, ppAdapter); } diff --git a/trunk/ulp/netdirect2/user/nd_provider.h b/trunk/ulp/netdirect2/user/nd_provider.h index b636cfc5..0c38d8e5 100644 --- a/trunk/ulp/netdirect2/user/nd_provider.h +++ b/trunk/ulp/netdirect2/user/nd_provider.h @@ -49,7 +49,7 @@ public: SIZE_T* pcbAddressList); STDMETHODIMP ResolveAddress(const struct sockaddr* pAddress, SIZE_T cbAddress, UINT64* pAdapterId); - STDMETHODIMP OpenAdapter(UINT64 adapterId, INDAdapter** ppAdapter); + STDMETHODIMP OpenAdapter(REFIID iid, UINT64 adapterId, VOID** ppAdapter); CNDProvider(); ~CNDProvider(); -- 2.46.0