[winOFED] update with svn 2904, 2905 commits.

git-svn-id: svn://openib.tc.cornell.edu/gen1@2907 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/WOF2-3/core/winmad/user/wm_provider.cpp b/branches/WOF2-3/core/winmad/user/wm_provider.cpp
index 4dca5691439e11c8236c25bda5f182ced10985b1..7b026eabf4c2ce3c763670e0d5eb8d82644e9fcd 100644 (file)
--- a/branches/WOF2-3/core/winmad/user/wm_provider.cpp
+++ b/branches/WOF2-3/core/winmad/user/wm_provider.cpp
@@ -187,8 +187,11 @@ Send(WM_MAD *pMad, OVERLAPPED *pOverlapped)
        bytes = (DWORD) sizeof(WM_MAD) + pMad->Length;\r
        if (pOverlapped == NULL) {\r
                EnterCriticalSection(&m_CritSecWrite);\r
-               WriteFile(m_hFile, pMad, bytes, &bytes, &m_OverlapWrite);\r
-               hr = GetOverlappedResult(&m_OverlapWrite, &bytes, TRUE);\r
+               if (WriteFile(m_hFile, pMad, bytes, &bytes, &m_OverlapWrite)) {\r
+                       hr = GetOverlappedResult(&m_OverlapWrite, &bytes, TRUE);\r
+               } else {\r
+                       hr = HRESULT_FROM_WIN32(GetLastError());\r
+               }\r
                LeaveCriticalSection(&m_CritSecWrite);\r
        } else {\r
                if (WriteFile(m_hFile, pMad, bytes, &bytes, pOverlapped)) {\r
@@ -209,8 +212,11 @@ Receive(WM_MAD *pMad, SIZE_T BufferSize, OVERLAPPED *pOverlapped)
 \r
        if (pOverlapped == NULL) {\r
                EnterCriticalSection(&m_CritSecRead);\r
-               ReadFile(m_hFile, pMad, (DWORD) BufferSize, &bytes, &m_OverlapRead);\r
-               hr = GetOverlappedResult(&m_OverlapRead, &bytes, TRUE);\r
+               if (ReadFile(m_hFile, pMad, (DWORD) BufferSize, &bytes, &m_OverlapRead)) {\r
+                       hr = GetOverlappedResult(&m_OverlapRead, &bytes, TRUE);\r
+               } else {\r
+                       hr = HRESULT_FROM_WIN32(GetLastError());\r
+               }\r
                LeaveCriticalSection(&m_CritSecRead);\r
        } else {\r
                if (ReadFile(m_hFile, pMad, (DWORD) BufferSize, &bytes, pOverlapped)) {\r

diff --git a/branches/WOF2-3/inc/user/rdma/winverbs.h b/branches/WOF2-3/inc/user/rdma/winverbs.h
index 933fe7a30dd5f2ec00e24d29602e63b46414d0b3..fefef84331c4200b05c09b81838577000cbb7127 100644 (file)
--- a/branches/WOF2-3/inc/user/rdma/winverbs.h
+++ b/branches/WOF2-3/inc/user/rdma/winverbs.h
@@ -1542,10 +1542,20 @@ DECLARE_INTERFACE_(IWVProvider, IUnknown)
                ) PURE;\r
 };\r
 \r
-#ifdef __cplusplus\r
-extern "C" __declspec(dllexport) HRESULT WvGetObject(REFIID riid, LPVOID FAR* ppvObj);\r
+#ifdef EXPORT_WV_SYMBOLS\r
+#define WV_EXPORT __declspec(dllexport)\r
 #else\r
-__declspec(dllexport) HRESULT WvGetObject(REFIID riid, LPVOID FAR* ppvObj);\r
+#define WV_EXPORT __declspec(dllimport)\r
+#endif\r
+\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif\r
+\r
+WV_EXPORT HRESULT WvGetObject(REFIID riid, LPVOID FAR* ppvObj);\r
+\r
+#ifdef __cplusplus\r
+}\r
 #endif\r
 \r
 #endif // _WINVERBS_H_\r