[pywin32-checkins] pywin32/win32/src/win32wnet PyNCB.cpp, 1.4, 1.5 PyNetresource.cpp, 1.3, 1.4 win3

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/pywin32/pywin32/win32/src/win32wnet
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1177/win32/src/win32wnet

Modified Files:
	PyNCB.cpp PyNetresource.cpp win32wnet.cpp 
Log Message:
Many 'benign' changes from the py3k branch, mainly around using 
PYWIN_OBJECT_HEAD and whitespace related changes around the type defs.

Index: win32wnet.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32wnet/win32wnet.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** win32wnet.cpp	3 Jun 2007 14:53:07 -0000	1.13
--- win32wnet.cpp	3 Dec 2008 22:34:21 -0000	1.14
***************
*** 61,65 ****

- 
  /****************************************************************************
  		HELPER FUNCTIONS
--- 61,64 ----
***************
*** 186,201 ****
  PyWNetCancelConnection2 (PyObject *self, PyObject *args)
  {
! 	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.
  	DWORD	bForce; // @pyparm int|force||indicates if the close operation should be forced. (i.e. ignore open files and connections)
  	DWORD	ErrorNo;

! 	if(!PyArg_ParseTuple(args, "sii",&lpName, &dwFlags, &bForce))
  		return NULL;
- 
  	Py_BEGIN_ALLOW_THREADS
  		ErrorNo = WNetCancelConnection2(lpName, dwFlags, (BOOL)bForce);
  	Py_END_ALLOW_THREADS
! 
  	if (ErrorNo != NO_ERROR)
  	{
--- 185,202 ----
  PyWNetCancelConnection2 (PyObject *self, PyObject *args)
  {
! 	LPTSTR	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.
  	DWORD	bForce; // @pyparm int|force||indicates if the close operation should be forced. (i.e. ignore open files and connections)
  	DWORD	ErrorNo;

! 	PyObject *obName;
! 	if(!PyArg_ParseTuple(args, "Okk", &obName, &dwFlags, &bForce))
! 		return NULL;
! 	if (!PyWinObject_AsTCHAR(obName, &lpName, FALSE))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
  		ErrorNo = WNetCancelConnection2(lpName, dwFlags, (BOOL)bForce);
  	Py_END_ALLOW_THREADS
! 	PyWinObject_FreeTCHAR(lpName);
  	if (ErrorNo != NO_ERROR)
  	{
***************
*** 220,232 ****
  	// @pyparm int|type||Specifies the resource types to enumerate.
  	// @pyparm int|usage||Specifies the resource usage to be enumerated.
! 	// @pyparm <o NETRESOURCE>|resource||Python NETRESOURCE object.

  	if (!PyArg_ParseTuple(args, "iiiO", &dwScope,&dwType,&dwUsage,&ob_nr))
  		return NULL;
! 	if (ob_nr == Py_None)
! 		p_nr = NULL;
! 	else if
! 		(!PyWinObject_AsNETRESOURCE(ob_nr, &p_nr, FALSE))
! 			return(ReturnError("failed converting NetResource Object","WNetOpenEnum"));

  	Py_BEGIN_ALLOW_THREADS
--- 221,230 ----
  	// @pyparm int|type||Specifies the resource types to enumerate.
  	// @pyparm int|usage||Specifies the resource usage to be enumerated.
! 	// @pyparm <o PyNETRESOURCE>|resource||Python NETRESOURCE object.

  	if (!PyArg_ParseTuple(args, "iiiO", &dwScope,&dwType,&dwUsage,&ob_nr))
  		return NULL;
! 	if (!PyWinObject_AsNETRESOURCE(ob_nr, &p_nr, TRUE))
! 		return NULL;

  	Py_BEGIN_ALLOW_THREADS
***************
*** 263,267 ****
  };

! // @pymethod [<o NETRESOURCE>, ...]|win32wnet|WNetEnumResource|Enumerates a list of resources
  static
  PyObject *
--- 261,265 ----
  };

! // @pymethod [<o PyNETRESOURCE>, ...]|win32wnet|WNetEnumResource|Enumerates a list of resources
  static
  PyObject *
***************
*** 478,482 ****
  }

! // @pymethod (<o NETRESOURCE>, str)|win32wnet|WNetGetResourceInformation|Finds the type and provider of a network resource
  // @rdesc Returns a NETRESOURCE and a string containing the trailing part of the remote path
  PyObject *
--- 476,480 ----
  }

! // @pymethod (<o PyNETRESOURCE>, str)|win32wnet|WNetGetResourceInformation|Finds the type and provider of a network resource
  // @rdesc Returns a NETRESOURCE and a string containing the trailing part of the remote path
  PyObject *
***************
*** 494,498 ****

  	if (!PyArg_ParseTuple(args, "O!", &PyNETRESOURCEType, 
! 		&NRT))	// @pyparm <o NETRESOURCE>|NetResource||Describes a network resource.  lpRemoteName is required, dwType and lpProvider can be supplied if known
  		return NULL;

--- 492,496 ----

  	if (!PyArg_ParseTuple(args, "O!", &PyNETRESOURCEType, 
! 		&NRT))	// @pyparm <o PyNETRESOURCE>|NetResource||Describes a network resource.  lpRemoteName is required, dwType and lpProvider can be supplied if known
  		return NULL;

***************
*** 563,567 ****
  	TCHAR errstr[1024], provider[256];
  	Py_BEGIN_ALLOW_THREADS
! 	err=WNetGetLastError(&extendederr, errstr, sizeof(errstr), provider, sizeof(provider));
  	Py_END_ALLOW_THREADS
  	if (err==NO_ERROR)
--- 561,565 ----
  	TCHAR errstr[1024], provider[256];
  	Py_BEGIN_ALLOW_THREADS
! 	err=WNetGetLastError(&extendederr, errstr, sizeof(errstr)/sizeof(TCHAR), provider, sizeof(provider)/sizeof(TCHAR));
  	Py_END_ALLOW_THREADS
  	if (err==NO_ERROR)
***************
*** 570,574 ****
  }

! // @pymethod <o NETRESOURCE>|win32wnet|WNetGetResourceParent|Finds the parent resource of a network resource
  PyObject *PyWNetGetResourceParent(PyObject *self, PyObject *args)
  {
--- 568,572 ----
  }

! // @pymethod <o PyNETRESOURCE>|win32wnet|WNetGetResourceParent|Finds the parent resource of a network resource
  PyObject *PyWNetGetResourceParent(PyObject *self, PyObject *args)
  {
***************
*** 580,584 ****
  	PyObject *obnr, *ret=NULL;
  	if (!PyArg_ParseTuple(args, "O:WNetGetResourceParent", 
! 		&obnr))		// @pyparm <o NETRESOURCE>|NetResource||Describes a network resource.  lpRemoteName and lpProvider are required, dwType is recommended for efficiency
  		return NULL;
  	if (!PyWinObject_AsNETRESOURCE(obnr, &nr, FALSE))
--- 578,582 ----
  	PyObject *obnr, *ret=NULL;
  	if (!PyArg_ParseTuple(args, "O:WNetGetResourceParent", 
! 		&obnr))		// @pyparm <o PyNETRESOURCE>|NetResource||Describes a network resource.  lpRemoteName and lpProvider are required, dwType is recommended for efficiency
  		return NULL;
  	if (!PyWinObject_AsNETRESOURCE(obnr, &nr, FALSE))
***************
*** 621,625 ****
  	{"Netbios",					PyWinMethod_Netbios,			1,	"Calls the windows Netbios function"},
  	// @pymeth WNetAddConnection2|Creates a connection to a network resource.
! 	{"WNetAddConnection2",		PyWNetAddConnection2,		1,	"type,localname,remotename,provider,username,password (does not use NETRESOURCE)"},
  	// @pymeth WNetCancelConnection2|Closes network connections made by WNetAddConnection2 or 3
  	{"WNetCancelConnection2",	PyWNetCancelConnection2,	1,	"localname,dwflags,bforce"},
--- 619,623 ----
  	{"Netbios",					PyWinMethod_Netbios,			1,	"Calls the windows Netbios function"},
  	// @pymeth WNetAddConnection2|Creates a connection to a network resource.
! 	{"WNetAddConnection2",		(PyCFunction)PyWNetAddConnection2,	METH_KEYWORDS|METH_VARARGS,	"WNetAddConnection2(NetResource, Password, UserName, Flags)"},
  	// @pymeth WNetCancelConnection2|Closes network connections made by WNetAddConnection2 or 3
  	{"WNetCancelConnection2",	PyWNetCancelConnection2,	1,	"localname,dwflags,bforce"},
***************
*** 660,662 ****
    Py_INCREF(PyWinExc_ApiError);
  }
- 
--- 658,659 ----

Index: PyNetresource.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32wnet/PyNetresource.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PyNetresource.cpp	19 Apr 2006 03:15:11 -0000	1.3
--- PyNetresource.cpp	3 Dec 2008 22:34:21 -0000	1.4
***************
*** 38,42 ****
  /* Main PYTHON entry point for creating a new reference.  Registered by win32wnet module */

! // @pymethod <o NETRESOURCE>|win32wnet|NETRESOURCE|Creates a new <o NETRESOURCE> object.

  PyObject *PyWinMethod_NewNETRESOURCE(PyObject *self, PyObject *args)
--- 38,42 ----
  /* Main PYTHON entry point for creating a new reference.  Registered by win32wnet module */

! // @pymethod <o PyNETRESOURCE>|win32wnet|NETRESOURCE|Creates a new <o NETRESOURCE> object.

  PyObject *PyWinMethod_NewNETRESOURCE(PyObject *self, PyObject *args)
***************
*** 81,90 ****

! // @object NETRESOURCE|A Python object that encapsulates a Win32 NETRESOURCE structure.
  __declspec(dllexport)
  PyTypeObject PyNETRESOURCEType =
  {
! 	PyObject_HEAD_INIT(&PyType_Type)
! 	0,
  	"PyNETRESOURCE",
  	sizeof(PyNETRESOURCE),
--- 81,89 ----

! // @object PyNETRESOURCE|A Python object that encapsulates a Win32 NETRESOURCE structure.
  __declspec(dllexport)
  PyTypeObject PyNETRESOURCEType =
  {
! 	PYWIN_OBJECT_HEAD
  	"PyNETRESOURCE",
  	sizeof(PyNETRESOURCE),
***************
*** 104,116 ****
  };

- 
  #define OFF(e) offsetof(PyNETRESOURCE, e)

  struct memberlist PyNETRESOURCE::memberlist[] =
  {
! 	{"dwScope",		T_LONG,	OFF(m_nr.dwScope),	0}, // @prop integer|dwScope|
! 	{"dwType",		T_LONG,	OFF(m_nr.dwType),	0}, // @prop integer|dwType|
! 	{"dwDisplayType", T_LONG,OFF(m_nr.dwDisplayType),	0}, // @prop integer|dwDisplayType|
! 	{"dwUsage",		T_LONG,	OFF(m_nr.dwUsage),	0}, // @prop integer|dwUsage|
  	{"lpLocalName",	T_STRING, OFF(m_nr.lpLocalName),	0}, // @prop string|localName|
  	{"lpRemoteName",T_STRING, OFF(m_nr.lpRemoteName),	0},// @prop string|remoteName|
--- 103,115 ----
  };

  #define OFF(e) offsetof(PyNETRESOURCE, e)

  struct memberlist PyNETRESOURCE::memberlist[] =
  {
! 	{"dwScope",		T_ULONG,	OFF(m_nr.dwScope),	0}, // @prop integer|dwScope|
! 	{"dwType",		T_ULONG,	OFF(m_nr.dwType),	0}, // @prop integer|dwType|
! 	{"dwDisplayType", T_ULONG,OFF(m_nr.dwDisplayType),	0}, // @prop integer|dwDisplayType|
! 	{"dwUsage",		T_ULONG,	OFF(m_nr.dwUsage),	0}, // @prop integer|dwUsage|
! 
  	{"lpLocalName",	T_STRING, OFF(m_nr.lpLocalName),	0}, // @prop string|localName|
  	{"lpRemoteName",T_STRING, OFF(m_nr.lpRemoteName),	0},// @prop string|remoteName|
***************
*** 195,199 ****
  	PyNETRESOURCE *This = (PyNETRESOURCE *)self;

! 	if (strcmp(name, "lpProvider") == 0)
  		return PyWinObject_FromWCHAR(This->m_nr.lpProvider);
  	else if
--- 194,198 ----
  	PyNETRESOURCE *This = (PyNETRESOURCE *)self;

! 	if (strcmp(name, "lpProvider")==0)
  		return PyWinObject_FromWCHAR(This->m_nr.lpProvider);
  	else if
***************
*** 215,224 ****
  int PyNETRESOURCE::setattr(PyObject *self, char *name, PyObject *v)
  {
- 	PyNETRESOURCE *This = (PyNETRESOURCE *)self;
- 
  	if (v == NULL) {
  		PyErr_SetString(PyExc_AttributeError, "can't delete NETRESOURCE attributes");
  		return -1;
  	}

  // the following specific string attributes can be set, all others generate an error.
--- 214,222 ----
  int PyNETRESOURCE::setattr(PyObject *self, char *name, PyObject *v)
  {
  	if (v == NULL) {
  		PyErr_SetString(PyExc_AttributeError, "can't delete NETRESOURCE attributes");
  		return -1;
  	}
+ 	PyNETRESOURCE *This = (PyNETRESOURCE *)self;

  // the following specific string attributes can be set, all others generate an error.
***************
*** 270,274 ****

- 
  void PyNETRESOURCE::deallocFunc(PyObject *ob)
  {
--- 268,271 ----

Index: PyNCB.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32wnet/PyNCB.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PyNCB.cpp	21 Oct 2005 06:14:04 -0000	1.4
--- PyNCB.cpp	3 Dec 2008 22:34:21 -0000	1.5
***************
*** 30,34 ****
  #endif

! 
  #include <windows.h>
  #include "python.h"
--- 30,34 ----
  #endif

! #include "Pywintypes.h"
  #include <windows.h>
  #include "python.h"
***************
*** 40,60 ****
  __declspec(dllexport)PyTypeObject PyNCBType =
  {
! 	PyObject_HEAD_INIT(&PyType_Type)
! 	0,
  	"PyNCB",
  	sizeof(PyNCB),
  	0,
! 	PyNCB::deallocFunc,			/* tp_dealloc */
! 	0,							/* tp_print */
  	PyNCB::getattr,				/* tp_getattr */
  	PyNCB::setattr,				/* tp_setattr */
  //	PyNCB::compareFunc,			/* tp_compare */
! 	0,							/* tp_repr */
! 	0,							/* tp_as_number */
! 	0,							/* tp_as_sequence */
! 	0,							/* tp_as_mapping */
! 	0,							/* hash? */
! 	0,							/* tp_call */
! 	0,							/* tp_str */
  };

--- 40,59 ----
  __declspec(dllexport)PyTypeObject PyNCBType =
  {
! 	PYWIN_OBJECT_HEAD
  	"PyNCB",
  	sizeof(PyNCB),
  	0,
! 	PyNCB::deallocFunc,		/* tp_dealloc */
! 	0,						/* tp_print */
  	PyNCB::getattr,				/* tp_getattr */
  	PyNCB::setattr,				/* tp_setattr */
  //	PyNCB::compareFunc,			/* tp_compare */
! 	0,						/* tp_repr */
! 	0,						/* tp_as_number */
! 	0,						/* tp_as_sequence */
! 	0,						/* tp_as_mapping */
! 	0,						/* tp_hash */
! 	0,						/* tp_call */
! 	0,						/* tp_str */
  };

***************
*** 187,191 ****
  {
  	PyNCB *This = (PyNCB *)self;
- 
  	if (strcmp(name, "Callname") == 0)	// these "strings" are not null terminated so build
  										// a local representation of them and return
--- 186,189 ----
***************
*** 309,311 ****
  }

! #endif
\ No newline at end of file
--- 307,309 ----
  }

! #endif

[pywin32-checkins] pywin32/win32/src/win32wnet PyNCB.cpp, 1.4, 1.5 PyNetresource.cpp, 1.3, 1.4 win3

OLD project page for the Python extensions for Windows

[pywin32-checkins] pywin32/win32/src/win32wnet PyNCB.cpp, 1.4, 1.5 PyNetresource.cpp, 1.3, 1.4 win32wnet.cpp, 1.13, 1.14