Refresh of nd-adapt

diff --git a/trunk/ulp/netdirect2/user/nd_adapter.cpp b/trunk/ulp/netdirect2/user/nd_adapter.cpp
index 9b99c1ef618741f11369865ba8a5a5bdd9a54987..1e40058f2b3cc98fe634020dfb057a5350c4c69c 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_adapter.cpp
+++ b/trunk/ulp/netdirect2/user/nd_adapter.cpp
@@ -167,80 +167,111 @@ QueryAddressList(SOCKET_ADDRESS_LIST* pAddressList, SIZE_T* pcbAddressList)
 }\r
 \r
 STDMETHODIMP CNDAdapter::\r
-CreateCompletionQueue(DWORD queueDepth, GROUP_AFFINITY* pAffinity,\r
-                                         INDCompletionQueue** ppCompletionQueue)\r
+CreateCompletionQueue(REFIID iid, DWORD queueDepth, GROUP_AFFINITY* pAffinity,\r
+                                         VOID** ppCompletionQueue)\r
 {\r
        return CNDCompletionQueue::CreateInstance(this, queueDepth, ppCompletionQueue);\r
 }\r
 \r
 STDMETHODIMP CNDAdapter::\r
-CreateMemoryRegion(INDMemoryRegion** ppMemoryRegion)\r
+CreateMemoryRegion(REFIID iid, VOID** ppMemoryRegion)\r
 {\r
+       if (iid != IID_INDMemoryRegion) {\r
+               return E_NOINTERFACE;\r
+       }\r
+\r
        return CNDMemoryRegion::CreateInstance(this, ppMemoryRegion);\r
 }\r
 \r
 STDMETHODIMP CNDAdapter::\r
-CreateMemoryWindow(INDMemoryWindow** ppMemoryWindow)\r
+CreateMemoryWindow(REFIID iid, VOID** ppMemoryWindow)\r
 {\r
+       if (iid != IID_INDMemoryWindow) {\r
+               return E_NOINTERFACE;\r
+       }\r
+\r
        return CNDMemoryWindow::CreateInstance(this, ppMemoryWindow);\r
 }\r
 \r
 STDMETHODIMP CNDAdapter::\r
-CreateSharedReceiveQueue(DWORD queueDepth, DWORD maxSGE,\r
+CreateSharedReceiveQueue(REFIID iid, DWORD queueDepth, DWORD maxSge,\r
                                                 DWORD notifyThreshold, GROUP_AFFINITY* pAffinity,\r
-                                                INDSharedReceiveQueue** ppSharedReceiveQueue)\r
+                                                VOID** ppSharedReceiveQueue)\r
 {\r
-       return CNDSharedReceiveQueue::CreateInstance(this, queueDepth, maxSGE,\r
+       if (iid != IID_INDSharedReceiveQueue) {\r
+               return E_NOINTERFACE;\r
+       }\r
+\r
+       return CNDSharedReceiveQueue::CreateInstance(this, queueDepth, maxSge,\r
                                                                                                 notifyThreshold, pAffinity,\r
                                                                                                 ppSharedReceiveQueue);\r
 }\r
 \r
 STDMETHODIMP CNDAdapter::\r
-CreateQueuePair(INDCompletionQueue* pReceiveCompletionQueue,\r
-                               INDCompletionQueue* pInitiatorCompletionQueue, VOID* context,\r
+CreateQueuePair(REFIID iid, IUnknown* pReceiveCompletionQueue,\r
+                               IUnknown* pInitiatorCompletionQueue, VOID* context,\r
                                DWORD receiveQueueDepth, DWORD initiatorQueueDepth,\r
-                               DWORD maxReceiveRequestSGE, DWORD maxInitiatorRequestSGE,\r
-                               INDQueuePair** ppQueuePair)\r
+                               DWORD maxReceiveRequestSge, DWORD maxInitiatorRequestSge,\r
+                               VOID** ppQueuePair)\r
 {\r
        CNDCompletionQueue *rcq = (CNDCompletionQueue *) pReceiveCompletionQueue;\r
        CNDCompletionQueue *icq = (CNDCompletionQueue *) pInitiatorCompletionQueue;\r
 \r
+       if (iid != IID_INDQueuePair) {\r
+               return E_NOINTERFACE;\r
+       }\r
+\r
        return CNDQueuePair::CreateInstance(this, rcq, icq, NULL,\r
                                                                                context, receiveQueueDepth, initiatorQueueDepth,\r
-                                                                               maxReceiveRequestSGE, maxInitiatorRequestSGE,\r
+                                                                               maxReceiveRequestSge, maxInitiatorRequestSge,\r
                                                                                ppQueuePair);\r
 }\r
 \r
 STDMETHODIMP CNDAdapter::\r
-CreateQueuePairWithSRQ(INDCompletionQueue* pReceiveCompletionQueue,\r
-                                          INDCompletionQueue* pInitiatorCompletionQueue,\r
-                                          INDSharedReceiveQueue* pSharedReceiveQueue, VOID* context,\r
-                                          DWORD initiatorQueueDepth, DWORD maxInitiatorRequestSGE,\r
-                                          INDQueuePair** ppQueuePair)\r
+CreateQueuePairWithSRQ(REFIID iid, IUnknown* pReceiveCompletionQueue,\r
+                                          IUnknown* pInitiatorCompletionQueue,\r
+                                          IUnknown* pSharedReceiveQueue, VOID* context,\r
+                                          DWORD initiatorQueueDepth, DWORD maxInitiatorRequestSge,\r
+                                          VOID** ppQueuePair)\r
 {\r
        CNDCompletionQueue *rcq = (CNDCompletionQueue *) pReceiveCompletionQueue;\r
        CNDCompletionQueue *icq = (CNDCompletionQueue *) pInitiatorCompletionQueue;\r
        CNDSharedReceiveQueue *srq = (CNDSharedReceiveQueue *) pSharedReceiveQueue;\r
 \r
+       if (iid != IID_INDQueuePair) {\r
+               return E_NOINTERFACE;\r
+       }\r
+\r
        return CNDQueuePair::CreateInstance(this, rcq, icq, srq,\r
                                                                                context, 0, initiatorQueueDepth, 0,\r
-                                                                               maxInitiatorRequestSGE, ppQueuePair);\r
+                                                                               maxInitiatorRequestSge, ppQueuePair);\r
 }\r
 \r
 STDMETHODIMP CNDAdapter::\r
-CreateSharedEndpoint(INDSharedEndpoint** ppSharedEndpoint)\r
+CreateSharedEndpoint(REFIID iid, VOID** ppSharedEndpoint)\r
 {\r
+       if (iid != IID_INDSharedEndpoint) {\r
+               return E_NOINTERFACE;\r
+       }\r
+\r
        return CNDSharedEndpoint::CreateInstance(this, ppSharedEndpoint);\r
 }\r
 \r
 STDMETHODIMP CNDAdapter::\r
-CreateConnector(INDConnector** ppConnector)\r
+CreateConnector(REFIID iid, VOID** ppConnector)\r
 {\r
+       if (iid != IID_INDConnector) {\r
+               return E_NOINTERFACE;\r
+       }\r
        return CNDConnector::CreateInstance(this, ppConnector);\r
 }\r
 \r
 STDMETHODIMP CNDAdapter::\r
-CreateListen(INDListen** ppListen)\r
+CreateListen(REFIID iid, VOID** ppListen)\r
 {\r
+       if (iid != IID_INDListen) {\r
+               return E_NOINTERFACE;\r
+       }\r
+\r
        return CNDListen::CreateInstance(this, ppListen);\r
 }\r

diff --git a/trunk/ulp/netdirect2/user/nd_adapter.h b/trunk/ulp/netdirect2/user/nd_adapter.h
index 4210ee3747eee1bd1477c6b19533d05a2e5f3da2..7280c538373ef403ff3abe1bdef178af9bdc5f97 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_adapter.h
+++ b/trunk/ulp/netdirect2/user/nd_adapter.h
@@ -49,26 +49,26 @@ public:
        STDMETHODIMP_(HANDLE) GetFileHandle();\r
        STDMETHODIMP Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo);\r
        STDMETHODIMP QueryAddressList(SOCKET_ADDRESS_LIST* pAddressList, SIZE_T* pcbAddressList);\r
-       STDMETHODIMP CreateCompletionQueue(DWORD queueDepth, GROUP_AFFINITY* pAffinity,\r
-                                                                          INDCompletionQueue** ppCompletionQueue);\r
-       STDMETHODIMP CreateMemoryRegion(INDMemoryRegion** ppMemoryRegion);\r
-       STDMETHODIMP CreateMemoryWindow(INDMemoryWindow** ppMemoryWindow);\r
-       STDMETHODIMP CreateSharedReceiveQueue(DWORD queueDepth, DWORD maxSGE,\r
+       STDMETHODIMP CreateCompletionQueue(REFIID iid, DWORD queueDepth, GROUP_AFFINITY* pAffinity,\r
+                                                                          VOID** ppCompletionQueue);\r
+       STDMETHODIMP CreateMemoryRegion(REFIID iid, VOID** ppMemoryRegion);\r
+       STDMETHODIMP CreateMemoryWindow(REFIID iid, VOID** ppMemoryWindow);\r
+       STDMETHODIMP CreateSharedReceiveQueue(REFIID iid, DWORD queueDepth, DWORD maxSge,\r
                                                                                  DWORD notifyThreshold, GROUP_AFFINITY* pAffinity,\r
-                                                                                 INDSharedReceiveQueue** ppSharedReceiveQueue);\r
-       STDMETHODIMP CreateQueuePair(INDCompletionQueue* pReceiveCompletionQueue,\r
-                                                                INDCompletionQueue* pInitiatorCompletionQueue, VOID* context,\r
+                                                                                 VOID** ppSharedReceiveQueue);\r
+       STDMETHODIMP CreateQueuePair(REFIID iid, IUnknown* pReceiveCompletionQueue,\r
+                                                                IUnknown* pInitiatorCompletionQueue, VOID* context,\r
                                                                 DWORD receiveQueueDepth, DWORD initiatorQueueDepth,\r
-                                                                DWORD maxReceiveRequestSGE, DWORD maxInitiatorRequestSGE,\r
-                                                                INDQueuePair** ppQueuePair);\r
-       STDMETHODIMP CreateQueuePairWithSRQ(INDCompletionQueue* pReceiveCompletionQueue,\r
-                                                                               INDCompletionQueue* pInitiatorCompletionQueue,\r
-                                                                               INDSharedReceiveQueue* pSharedReceiveQueue, VOID* context,\r
-                                                                               DWORD initiatorQueueDepth, DWORD maxInitiatorRequestSGE,\r
-                                                                               INDQueuePair** ppQueuePair);\r
-       STDMETHODIMP CreateSharedEndpoint(INDSharedEndpoint** ppSharedEndpoint);\r
-       STDMETHODIMP CreateConnector(INDConnector** ppConnector);\r
-       STDMETHODIMP CreateListen(INDListen** ppListen);\r
+                                                                DWORD maxReceiveRequestSge, DWORD maxInitiatorRequestSge,\r
+                                                                VOID** ppQueuePair);\r
+       STDMETHODIMP CreateQueuePairWithSRQ(REFIID, IUnknown* pReceiveCompletionQueue,\r
+                                                                               IUnknown* pInitiatorCompletionQueue,\r
+                                                                               IUnknown* pSharedReceiveQueue, VOID* context,\r
+                                                                               DWORD initiatorQueueDepth, DWORD maxInitiatorRequestSge,\r
+                                                                               VOID** ppQueuePair);\r
+       STDMETHODIMP CreateSharedEndpoint(REFIID iid, VOID** ppSharedEndpoint);\r
+       STDMETHODIMP CreateConnector(REFIID iid, VOID** ppConnector);\r
+       STDMETHODIMP CreateListen(REFIID iid, VOID** ppListen);\r
 \r
        CNDAdapter(CNDProvider *pProvider);\r
        ~CNDAdapter();\r

diff --git a/trunk/ulp/netdirect2/user/nd_connect.h b/trunk/ulp/netdirect2/user/nd_connect.h
index dd1e142bc63b136c237755ac12f2ba9bacb6fb98..ea2b12d02c41286ca40bee29b38cb12b69f306b8 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_connect.h
+++ b/trunk/ulp/netdirect2/user/nd_connect.h
@@ -79,7 +79,7 @@ public:
        ~CNDConnector();\r
        void Delete() {delete this;}\r
        static STDMETHODIMP\r
-       CreateInstance(CNDAdapter *pAdapter, INDConnector** ppConnector)\r
+       CreateInstance(CNDAdapter *pAdapter, VOID** ppConnector)\r
        {\r
                HRESULT hr;\r
                CNDConnector *conn;\r

diff --git a/trunk/ulp/netdirect2/user/nd_cq.h b/trunk/ulp/netdirect2/user/nd_cq.h
index 1f6af0e9abacc05988ac31a32456301cc1ef3b63..dcca21181aa785d245c18cd13f480f5e68a08876 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_cq.h
+++ b/trunk/ulp/netdirect2/user/nd_cq.h
@@ -58,7 +58,7 @@ public:
        ~CNDCompletionQueue();\r
        void Delete() {delete this;}\r
        static STDMETHODIMP\r
-       CreateInstance(CNDAdapter *pAdapter, DWORD queueDepth, INDCompletionQueue** ppCq)\r
+       CreateInstance(CNDAdapter *pAdapter, DWORD queueDepth, VOID** ppCq)\r
        {\r
                HRESULT hr;\r
                CNDCompletionQueue *cq;\r

diff --git a/trunk/ulp/netdirect2/user/nd_ep.h b/trunk/ulp/netdirect2/user/nd_ep.h
index e33df948b5e6070813bd4be7d3c0294b407739ea..81ec18968debbd2501d82dfba1983da3ccefcad4 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_ep.h
+++ b/trunk/ulp/netdirect2/user/nd_ep.h
@@ -54,7 +54,7 @@ public:
        ~CNDSharedEndpoint();\r
        void Delete() {delete this;}\r
        static STDMETHODIMP\r
-       CreateInstance(CNDAdapter *pAdapter, INDSharedEndpoint** ppSharedEndpoint)\r
+       CreateInstance(CNDAdapter *pAdapter, VOID** ppSharedEndpoint)\r
        {\r
                HRESULT hr;\r
                CNDSharedEndpoint *ep;\r

diff --git a/trunk/ulp/netdirect2/user/nd_listen.h b/trunk/ulp/netdirect2/user/nd_listen.h
index d077a3ed71c8a52216f45d54c50edf586d67f8cc..83a5b869dca6e7d0831f14610ea76f924be7a8e0 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_listen.h
+++ b/trunk/ulp/netdirect2/user/nd_listen.h
@@ -58,7 +58,7 @@ public:
        ~CNDListen();\r
        void Delete() {delete this;}\r
        static STDMETHODIMP\r
-       CreateInstance(CNDAdapter *pAdapter, INDListen** ppListen)\r
+       CreateInstance(CNDAdapter *pAdapter, VOID** ppListen)\r
        {\r
                HRESULT hr;\r
                CNDListen *listener;\r

diff --git a/trunk/ulp/netdirect2/user/nd_mw.h b/trunk/ulp/netdirect2/user/nd_mw.h
index 8409a0e4d59796de503452dc51871c691ad82404..47c18b2d17fc8496cb7b23c1188bf0b56f71af07 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_mw.h
+++ b/trunk/ulp/netdirect2/user/nd_mw.h
@@ -56,7 +56,7 @@ public:
        ~CNDMemoryRegion();\r
        void Delete() {delete this;}\r
        static STDMETHODIMP\r
-       CreateInstance(CNDAdapter *pAdapter, INDMemoryRegion** ppMemoryRegion)\r
+       CreateInstance(CNDAdapter *pAdapter, VOID** ppMemoryRegion)\r
        {\r
                HRESULT hr;\r
                CNDMemoryRegion *mr;\r
@@ -97,7 +97,7 @@ public:
        ~CNDMemoryWindow();\r
        void Delete() {delete this;}\r
        static STDMETHODIMP\r
-       CreateInstance(CNDAdapter *pAdapter, INDMemoryWindow** ppMemoryWindow)\r
+       CreateInstance(CNDAdapter *pAdapter, VOID** ppMemoryWindow)\r
        {\r
                HRESULT hr;\r
                CNDMemoryWindow *mw;\r

diff --git a/trunk/ulp/netdirect2/user/nd_qp.h b/trunk/ulp/netdirect2/user/nd_qp.h
index 1d09ddc2648f8a03e1a6a382653cd43472e3b74d..3ce320ff0c06a06db46e42729bcb62f26f1c0cbd 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_qp.h
+++ b/trunk/ulp/netdirect2/user/nd_qp.h
@@ -71,7 +71,7 @@ public:
                                   CNDSharedReceiveQueue *pSharedReceiveQueue,\r
                                   VOID* context, DWORD receiveQueueDepth, DWORD initiatorQueueDepth,\r
                                   DWORD maxReceiveRequestSGE, DWORD maxInitiatorRequestSGE,\r
-                                  INDQueuePair** ppQueuePair)\r
+                                  VOID** ppQueuePair)\r
        {\r
                HRESULT hr;\r
                CNDQueuePair *qp;\r
@@ -111,7 +111,7 @@ protected:
                                          CNDCompletionQueue* pInitiatorCompletionQueue,\r
                                          CNDSharedReceiveQueue *pSharedReceiveQueue,\r
                                          VOID* context, DWORD receiveQueueDepth, DWORD initiatorQueueDepth,\r
-                                         DWORD maxReceiveRequestSGE, DWORD maxInitiatorRequestSGE);\r
+                                         DWORD maxReceiveRequestSge, DWORD maxInitiatorRequestSGE);\r
        STDMETHODIMP_(DWORD) ConvertSendFlags(DWORD Flags);\r
 };\r
 \r

diff --git a/trunk/ulp/netdirect2/user/nd_srq.h b/trunk/ulp/netdirect2/user/nd_srq.h
index 80f2c4b60725a502a3acaf7d04d93384e5cb74ed..269385594ae29f7c68ce86acd1e433695bcb31d5 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_srq.h
+++ b/trunk/ulp/netdirect2/user/nd_srq.h
@@ -61,7 +61,7 @@ public:
        static STDMETHODIMP\r
        CreateInstance(CNDAdapter *pAdapter, DWORD queueDepth, DWORD maxSGE,\r
                                   DWORD notifyThreshold, GROUP_AFFINITY* pAffinity,\r
-                                  INDSharedReceiveQueue** ppSharedReceiveQueue)\r
+                                  VOID** ppSharedReceiveQueue)\r
        {\r
                HRESULT hr;\r
                CNDSharedReceiveQueue *srq;\r