Refresh of nd-prov

diff --git a/trunk/ulp/netdirect2/user/nd_provider.cpp b/trunk/ulp/netdirect2/user/nd_provider.cpp
index 84da4dd390ea5850ceec07a64eb1e15c98c9d817..2f9d8cac5871d9a1eabfdec98888f6fccce763db 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_provider.cpp
+++ b/trunk/ulp/netdirect2/user/nd_provider.cpp
@@ -214,12 +214,7 @@ CreateInstance(IUnknown* pUnkOuter, REFIID riid, void** ppObject)
                return E_NOINTERFACE;\r
        }\r
 \r
-       *ppObject = new CNDProvider();\r
-       if (*ppObject == NULL) {\r
-               return E_OUTOFMEMORY;\r
-       }\r
-\r
-       return S_OK;\r
+       return CNDProvider::CreateInstance((CNDProvider **) ppObject);\r
 }\r
 \r
 STDMETHODIMP CNDClassFactory::\r

diff --git a/trunk/ulp/netdirect2/user/nd_provider.h b/trunk/ulp/netdirect2/user/nd_provider.h
index 504d5d1c80eb00fb186290850951562e5ef1feab..b636cfc5fca3e984077b071655358fb6093a2248 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_provider.h
+++ b/trunk/ulp/netdirect2/user/nd_provider.h
@@ -61,7 +61,7 @@ public:
                HRESULT hr;\r
                CNDProvider *provider;\r
 \r
-               provider = new CNDProvider(provider);\r
+               provider = new CNDProvider();\r
                if (provider == NULL) {\r
                        hr = ND_NO_MEMORY;\r
                        goto err1;\r