Update of /cvsroot/pywin32/pywin32/win32/src/win32wnet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7666/win32/src/win32wnet
Modified Files:
PyNCB.cpp win32wnet.cpp
Log Message:
Finish the excise of the atl unicode conversion macros.
Index: win32wnet.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32wnet/win32wnet.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** win32wnet.cpp 9 Feb 2001 07:24:36 -0000 1.8
--- win32wnet.cpp 21 Oct 2005 06:14:04 -0000 1.9
***************
*** 54,58 ****
#include "windows.h"
- #include "atlbase.h"
#include "Python.h"
#include "PyWinTypes.h"
--- 54,57 ----
***************
*** 137,142 ****
{
// @todo Eventually should update this to use a NETRESOURCE object (it was written before PyNETRESOURCE)
- USES_CONVERSION;
-
DWORD Type; // @pyparm int|type||The resource type. May be either RESOURCETYPE_DISK, RESOURCETYPE_PRINT, or RESOURCETYPE_ANY (from win32netcon)
LPSTR LocalName; // @pyparm string|localName||holds the name of a local device to map connection to; may be NULL
--- 136,139 ----
***************
*** 163,174 ****
memset((void *)&NetResource, '\0', sizeof(NETRESOURCE));
NetResource.dwType = Type;
! NetResource.lpLocalName = A2T(LocalName);
! NetResource.lpProvider = A2T(ProviderName);
! NetResource.lpRemoteName = A2T(RemoteName);
#ifdef _WIN32_WCE_ // Windows CE only has the #3 version...use NULL for HWND to simulate #2
! ErrorNo = WNetAddConnection3(NULL,&NetResource, A2T(Password), A2T(Username), flags);
#else
! ErrorNo = WNetAddConnection2(&NetResource, A2T(Password), A2T(Username), flags);
#endif
Py_END_ALLOW_THREADS
--- 160,171 ----
memset((void *)&NetResource, '\0', sizeof(NETRESOURCE));
NetResource.dwType = Type;
! NetResource.lpLocalName = LocalName;
! NetResource.lpProvider = ProviderName;
! NetResource.lpRemoteName = RemoteName;
#ifdef _WIN32_WCE_ // Windows CE only has the #3 version...use NULL for HWND to simulate #2
! ErrorNo = WNetAddConnection3(NULL,&NetResource, Password, Username, flags);
#else
! ErrorNo = WNetAddConnection2(&NetResource, Password, Username, flags);
#endif
Py_END_ALLOW_THREADS
***************
*** 189,194 ****
PyWNetCancelConnection2 (PyObject *self, PyObject *args)
{
- USES_CONVERSION;
-
LPSTR lpName; // @pyparm string|name||Name of existing connection to be closed
DWORD dwFlags; // @pyparm int|flags||Currently determines if the persisent connection information will be updated as a result of this call.
--- 186,189 ----
***************
*** 200,204 ****
Py_BEGIN_ALLOW_THREADS
! ErrorNo = WNetCancelConnection2(A2T(lpName), dwFlags, (BOOL)bForce);
Py_END_ALLOW_THREADS
--- 195,199 ----
Py_BEGIN_ALLOW_THREADS
! ErrorNo = WNetCancelConnection2(lpName, dwFlags, (BOOL)bForce);
Py_END_ALLOW_THREADS
Index: PyNCB.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32wnet/PyNCB.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PyNCB.cpp 4 Aug 2000 04:40:42 -0000 1.3
--- PyNCB.cpp 21 Oct 2005 06:14:04 -0000 1.4
***************
*** 33,37 ****
#include <windows.h>
#include "python.h"
- #include <atlbase.h>
#include "PyNCB.h"
--- 33,36 ----
|
