From: Sean Hefty <sean.hefty@intel.com>
Date: Tue, 27 Jul 2010 23:20:40 +0000 (-0700)
Subject: refresh (create temporary patch)
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c07620f0f11c5634b5f2c7bbbdc59742754b6e18;p=~shefty%2Frdma-win.git

refresh (create temporary patch)
---

diff --git a/meta b/meta
index 254bb5f4..4cffaa5e 100644
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 2a5965034c3bfa7885c77f1a53afdd536bf3c2ce
-Head: bfd844054eac46a39c0efd142c08cca58ae4667d
+Previous: 0496379cc8a73d9b8168481f7142568a2d361480
+Head: 1e3ea25a70d6c76d8a8dd8d6e17d458d89a971d3
 Applied:
   obj-cnt: 769fc52027c53c21d9d7d38ee70ab8c0e0b26916
   rm-cf: bfd844054eac46a39c0efd142c08cca58ae4667d
+  refresh-temp: 1e3ea25a70d6c76d8a8dd8d6e17d458d89a971d3
 Unapplied:
   cq-status: d4535a68c8d41302c9ee9d44b98a75ea19b4f172
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 00000000..a116e91c
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,144 @@
+Bottom: 726c23827e3e3079ed330d8bd63ea79aad673b39
+Top:    eb4a8ef725ebe4701a4586deb929fe272b445999
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-07-27 16:20:38 -0700
+
+Refresh of rm-cf
+
+---
+
+diff --git a/trunk/ulp/netdirect2/user/nd_main.cpp b/trunk/ulp/netdirect2/user/nd_main.cpp
+index 1b9e049..e995d60 100644
+--- a/trunk/ulp/netdirect2/user/nd_main.cpp
++++ b/trunk/ulp/netdirect2/user/nd_main.cpp
+@@ -72,17 +72,12 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
+ {
+ 	UNREFERENCED_PARAMETER(rclsid);
+ 
+-	if (riid != IID_IClassFactory) {
++	if (riid != IID_INDProvider) {
+ 		*ppv = NULL;
+ 		return E_NOINTERFACE;
+ 	}
+ 
+-	*ppv = new CNDClassFactory();
+-	if (*ppv == NULL) {
+-		return E_OUTOFMEMORY;
+-	}
+-
+-	return S_OK;
++	return CNDProvider::CreateInstance(ppv);
+ }
+ 
+ int WSPStartup(WORD wVersionRequested, LPWSPDATA lpWSPData,
+diff --git a/trunk/ulp/netdirect2/user/nd_provider.cpp b/trunk/ulp/netdirect2/user/nd_provider.cpp
+index cbc9c22..37362f7 100644
+--- a/trunk/ulp/netdirect2/user/nd_provider.cpp
++++ b/trunk/ulp/netdirect2/user/nd_provider.cpp
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright (c) 2009-2010 Intel Corporation. All rights reserved.
++ * Copyright (c) 2010 Microsoft Corporation.  All rights reserved.
+  *
+  * This software is available to you under the OpenIB.org BSD license
+  * below:
+@@ -64,7 +65,7 @@ CNDProvider::~CNDProvider()
+ 	if (m_pWvProvider) {
+ 		m_pWvProvider->Release();
+ 	}
+-	InterlockedDecrement(&m_gRef);
++	InterlockedDecrement(&g_nRef);
+ }
+ 
+ STDMETHODIMP CNDProvider::
+@@ -176,55 +177,3 @@ OpenAdapter(REFIID iid, UINT64 adapterId, VOID** ppAdapter)
+ 
+ 	return CNDAdapter::CreateInstance(this, adapterId, ppAdapter);
+ }
+-
+-
+-//-------------------------
+-// CNDClassFactory routines
+-//-------------------------
+-
+-STDMETHODIMP CNDClassFactory::
+-QueryInterface(REFIID riid, LPVOID FAR* ppvObj)
+-{
+-	if (riid != IID_IUnknown && riid != IID_IClassFactory) {
+-		*ppvObj = NULL;
+-		return E_NOINTERFACE;
+-	}
+-
+-	*ppvObj = this;
+-	AddRef();
+-	return ND_SUCCESS;
+-}
+-
+-STDMETHODIMP_(ULONG) CNDClassFactory::
+-AddRef(void)
+-{
+-	return CNDBase::AddRef();
+-}
+-
+-STDMETHODIMP_(ULONG) CNDClassFactory::
+-Release(void)
+-{
+-	return CNDBase::Release();
+-}
+-
+-STDMETHODIMP CNDClassFactory::
+-CreateInstance(IUnknown* pUnkOuter, REFIID riid, void** ppObject)
+-{
+-	if (pUnkOuter != NULL) {
+-		return CLASS_E_NOAGGREGATION;
+-	}
+-
+-	if (riid != IID_INDProvider) {
+-		*ppObject = NULL;
+-		return E_NOINTERFACE;
+-	}
+-
+-	return CNDProvider::CreateInstance((CNDProvider **) ppObject);
+-}
+-
+-STDMETHODIMP CNDClassFactory::
+-LockServer(BOOL fLock)
+-{
+-	UNREFERENCED_PARAMETER(fLock);
+-	return S_OK;
+-}
+diff --git a/trunk/ulp/netdirect2/user/nd_provider.h b/trunk/ulp/netdirect2/user/nd_provider.h
+index 0c38d8e..21962a2 100644
+--- a/trunk/ulp/netdirect2/user/nd_provider.h
++++ b/trunk/ulp/netdirect2/user/nd_provider.h
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright (c) 2009-2010 Intel Corporation. All rights reserved.
++ * Copyright (c) 2010 Microsoft Corporation.  All rights reserved.
+  *
+  * This software is available to you under the OpenIB.org BSD license
+  * below:
+@@ -90,22 +91,4 @@ private:
+ 	STDMETHODIMP Init();
+ };
+ 
+-
+-class CNDClassFactory : public IClassFactory, public CNDBase
+-{
+-public:
+-	// IUnknown methods
+-	STDMETHODIMP QueryInterface(REFIID riid, LPVOID FAR* ppvObj);
+-	STDMETHODIMP_(ULONG) AddRef();
+-	STDMETHODIMP_(ULONG) Release();
+-
+-	// IClassFactory methods
+-	STDMETHODIMP CreateInstance(IUnknown* pUnkOuter, REFIID riid, void** ppObject);
+-	STDMETHODIMP LockServer(BOOL fLock);
+-
+-	CNDClassFactory() {};
+-	~CNDClassFactory() {};
+-	void Delete() {delete this;}
+-};
+-
+ #endif // _ND_PROVIDER_H_
+\ No newline at end of file