Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14800
Modified Files:
win32file.i
Log Message:
Fix [ 1408486 ] WSARecv exception states the error is from "WSASend"
Index: win32file.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32file.i,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** win32file.i 14 Nov 2005 07:30:09 -0000 1.51
--- win32file.i 27 Feb 2006 10:46:35 -0000 1.52
***************
*** 581,585 ****
if (::GetLastError()!=ERROR_FILE_NOT_FOUND) { // this is OK
Py_DECREF(it);
! return PyWin_SetAPIError("FindNextFileW");
}
it->empty = TRUE;
--- 581,585 ----
if (::GetLastError()!=ERROR_FILE_NOT_FOUND) { // this is OK
Py_DECREF(it);
! return PyWin_SetAPIError("FindFirstFileW");
}
it->empty = TRUE;
***************
*** 1848,1852 ****
if (rc == SOCKET_ERROR)
{
! PyWin_SetAPIError("AcceptEx", WSAGetLastError());
return NULL;
}
--- 1848,1852 ----
if (rc == SOCKET_ERROR)
{
! PyWin_SetAPIError("getsockopt", WSAGetLastError());
return NULL;
}
***************
*** 2018,2022 ****
if (rc == SOCKET_ERROR)
{
! PyWin_SetAPIError("AcceptEx", WSAGetLastError());
return NULL;
}
--- 2018,2022 ----
if (rc == SOCKET_ERROR)
{
! PyWin_SetAPIError("getsockopt", WSAGetLastError());
return NULL;
}
***************
*** 2353,2357 ****
if (rc != ERROR_IO_PENDING)
{
! PyWin_SetAPIError("WSASend", rc);
goto Error;
}
--- 2353,2357 ----
if (rc != ERROR_IO_PENDING)
{
! PyWin_SetAPIError("WSARecv", rc);
goto Error;
}
***************
*** 2693,2697 ****
DWORD rc = ok ? 0 : GetLastError();
if (rc!=0 && rc != ERROR_IO_PENDING)
! return PyWin_SetAPIError("WaitCommError", rc);
return Py_BuildValue("ll", rc, *pmask);
// @rdesc The result is a tuple of (rc, mask_val), where rc is zero for success, or
--- 2693,2697 ----
DWORD rc = ok ? 0 : GetLastError();
if (rc!=0 && rc != ERROR_IO_PENDING)
! return PyWin_SetAPIError("WaitCommEvent", rc);
return Py_BuildValue("ll", rc, *pmask);
// @rdesc The result is a tuple of (rc, mask_val), where rc is zero for success, or
|
