From da80935a1ca8ce7569ad00d2e28d468b20c2d1e3 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 26 Jul 2010 15:31:04 -0700 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index d9a2fd8b..9a53ffd6 100644 --- a/meta +++ b/meta @@ -1,10 +1,11 @@ Version: 1 -Previous: bc68255223627047f0c9a39fb42ed0d62a95731b -Head: 8916470dca0a53b0c7e45c0a5f9b60b1098c964d +Previous: 4c41972883cb0ceb4201bce1436c70754745d8b0 +Head: 7fed4203bbc4af6677dc618cc9577d7a556353ed Applied: nd-heap: 4073d4bd9835679d69e79783b4fd841e173ec458 wv-reg: 2c86a99e122511e0ef8723c8ec08456f4002a39a nd-prov: 8916470dca0a53b0c7e45c0a5f9b60b1098c964d + refresh-temp: 7fed4203bbc4af6677dc618cc9577d7a556353ed Unapplied: srq: 0024a4123a3ed01d41c946126590641f9f76bc20 wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755 diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..e67543f7 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,40 @@ +Bottom: cf7e3a0e63654fbee37b6aff6e747920198fd2bc +Top: 05bb06f8076f496afcf9cd64410991dad9e8917c +Author: Sean Hefty +Date: 2010-07-26 15:31:01 -0700 + +Refresh of nd-prov + +--- + +diff --git a/trunk/ulp/netdirect2/user/nd_provider.cpp b/trunk/ulp/netdirect2/user/nd_provider.cpp +index 84da4dd..2f9d8ca 100644 +--- 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; + } + +- *ppObject = new CNDProvider(); +- if (*ppObject == NULL) { +- return E_OUTOFMEMORY; +- } +- +- return S_OK; ++ return CNDProvider::CreateInstance((CNDProvider **) ppObject); + } + + STDMETHODIMP CNDClassFactory:: +diff --git a/trunk/ulp/netdirect2/user/nd_provider.h b/trunk/ulp/netdirect2/user/nd_provider.h +index 504d5d1..b636cfc 100644 +--- a/trunk/ulp/netdirect2/user/nd_provider.h ++++ b/trunk/ulp/netdirect2/user/nd_provider.h +@@ -61,7 +61,7 @@ public: + HRESULT hr; + CNDProvider *provider; + +- provider = new CNDProvider(provider); ++ provider = new CNDProvider(); + if (provider == NULL) { + hr = ND_NO_MEMORY; + goto err1; -- 2.46.0