Update of /cvsroot/pywin32/pywin32/win32/src/win32net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4282/win32/src/win32net
Modified Files:
win32netmodule.cpp
Log Message:
Formalize some simple C++ exception handling for the exceptions.
Index: win32netmodule.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32net/win32netmodule.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** win32netmodule.cpp 6 Mar 2004 23:55:39 -0000 1.13
--- win32netmodule.cpp 30 Mar 2004 04:38:17 -0000 1.14
***************
*** 327,339 ****
Py_BEGIN_ALLOW_THREADS
/* Bad resume handles etc can cause access violations here - catch them. */
! __try {
err = (*pfn)(szServer, level, &buf, dwPrefLen, &numRead, &totalEntries, &resumeHandle);
}
! #if defined(__MINGW32__) || defined(MAINWIN)
! catch(...)
! #else
! __except( EXCEPTION_EXECUTE_HANDLER )
! #endif
! {
err = ERROR_INVALID_PARAMETER;
}
--- 327,334 ----
Py_BEGIN_ALLOW_THREADS
/* Bad resume handles etc can cause access violations here - catch them. */
! PYWINTYPES_TRY {
err = (*pfn)(szServer, level, &buf, dwPrefLen, &numRead, &totalEntries, &resumeHandle);
}
! PYWINTYPES_EXCEPT {
err = ERROR_INVALID_PARAMETER;
}
|