[pywin32-checkins] pywin32/win32/src/win32wnet PyNCB.cpp, 1.6, 1.7 PyNetresource.cpp, 1.5, 1.6

[Mark H. <mha...@us...>]

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

Modified Files:
	PyNCB.cpp PyNetresource.cpp 
Log Message:
Move away from 'unsigned' types as Python always gives us a long (even
for unsigned byte!)


Index: PyNetresource.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32wnet/PyNetresource.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PyNetresource.cpp	10 Dec 2008 11:13:51 -0000	1.5
--- PyNetresource.cpp	10 Dec 2008 23:48:49 -0000	1.6
***************
*** 126,133 ****
  struct PyMemberDef PyNETRESOURCE::members[] =
  {
! 	{"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|
  
  	// These are handled by getattro/setattro
--- 126,135 ----
  struct PyMemberDef PyNETRESOURCE::members[] =
  {
! 	// Note we avoid the use of 'U'nsigned types as they always force
! 	// a long to be returned.
! 	{"dwScope",		T_INT,		OFF(m_nr.dwScope),	0}, // @prop integer|dwScope|
! 	{"dwType",		T_INT,		OFF(m_nr.dwType),	0}, // @prop integer|dwType|
! 	{"dwDisplayType",	T_INT,		OFF(m_nr.dwDisplayType),	0}, // @prop integer|dwDisplayType|
! 	{"dwUsage",		T_INT,		OFF(m_nr.dwUsage),	0}, // @prop integer|dwUsage|
  
  	// These are handled by getattro/setattro

Index: PyNCB.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32wnet/PyNCB.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PyNCB.cpp	10 Dec 2008 11:13:51 -0000	1.6
--- PyNCB.cpp	10 Dec 2008 23:48:49 -0000	1.7
***************
*** 110,124 ****
  struct PyMemberDef PyNCB::members[] =
  {
! 	{"Command",	T_UBYTE,	OFF(m_ncb.ncb_command),	0}, // @prop int|Command|
! 	{"Retcode",	T_UBYTE,	OFF(m_ncb.ncb_retcode),	0},  // @prop int|Retcode|
! 	{"Lsn",		T_UBYTE,	OFF(m_ncb.ncb_lsn),		0}, // @prop int|Lsn|
! 	{"Num",		T_UBYTE,	OFF(m_ncb.ncb_num),		0}, // @prop int|Num|
! 	{"Bufflen",	T_USHORT,	OFF(m_ncb.ncb_length),	1},	 // @prop int|Bufflen|read-only
  	{"Callname",T_STRING,	OFF(m_ncb.ncb_callname),0},	 // @prop string|Callname| - The strings need to be space padded to 16 chars exactly
  	{"Name",	T_STRING,	OFF(m_ncb.ncb_name),	0}, // @prop string|Name| - The strings need to be space padded to 16 chars exactly
! 	{"Rto",		T_UBYTE,	OFF(m_ncb.ncb_rto),		0},// @prop string|Rto| - The strings need to be space padded to 16 chars exactly
! 	{"Sto",		T_UBYTE,	OFF(m_ncb.ncb_sto),		0},// @prop string|Sto| - The strings need to be space padded to 16 chars exactly
! 	{"Lana_num",T_UBYTE,	OFF(m_ncb.ncb_lana_num),0},// @prop int|Lana_num|
! 	{"Cmd_cplt",T_UBYTE,	OFF(m_ncb.ncb_cmd_cplt),0},// @prop int|Cmd_cplt|
  	{"Event",	T_LONG,	OFF(m_ncb.ncb_event),	0},// @prop int|Event|
  	{"Post",	T_LONG,	OFF(m_ncb.ncb_post),	0},// @prop int|Post|
--- 110,126 ----
  struct PyMemberDef PyNCB::members[] =
  {
! 	// Note we avoid the use of 'U'nsigned types as they always force
! 	// a long to be returned.
! 	{"Command",	T_BYTE,	OFF(m_ncb.ncb_command),	0}, // @prop int|Command|
! 	{"Retcode",	T_BYTE,	OFF(m_ncb.ncb_retcode),	0},  // @prop int|Retcode|
! 	{"Lsn",		T_BYTE,	OFF(m_ncb.ncb_lsn),		0}, // @prop int|Lsn|
! 	{"Num",		T_BYTE,	OFF(m_ncb.ncb_num),		0}, // @prop int|Num|
! 	{"Bufflen",	T_SHORT,	OFF(m_ncb.ncb_length),	1},	 // @prop int|Bufflen|read-only
  	{"Callname",T_STRING,	OFF(m_ncb.ncb_callname),0},	 // @prop string|Callname| - The strings need to be space padded to 16 chars exactly
  	{"Name",	T_STRING,	OFF(m_ncb.ncb_name),	0}, // @prop string|Name| - The strings need to be space padded to 16 chars exactly
! 	{"Rto",		T_BYTE,	OFF(m_ncb.ncb_rto),		0},// @prop string|Rto| - The strings need to be space padded to 16 chars exactly
! 	{"Sto",		T_BYTE,	OFF(m_ncb.ncb_sto),		0},// @prop string|Sto| - The strings need to be space padded to 16 chars exactly
! 	{"Lana_num",T_BYTE,	OFF(m_ncb.ncb_lana_num),0},// @prop int|Lana_num|
! 	{"Cmd_cplt",T_BYTE,	OFF(m_ncb.ncb_cmd_cplt),0},// @prop int|Cmd_cplt|
  	{"Event",	T_LONG,	OFF(m_ncb.ncb_event),	0},// @prop int|Event|
  	{"Post",	T_LONG,	OFF(m_ncb.ncb_post),	0},// @prop int|Post|