[pywin32-checkins] pywin32/win32/src/win32print win32print.cpp,1.10,1.11

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src/win32print
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31801/win32/src/win32print

Modified Files:
	win32print.cpp 
Log Message:
Fix compile errors for MSVC6

Index: win32print.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32print/win32print.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** win32print.cpp	24 Jan 2005 02:07:25 -0000	1.10
--- win32print.cpp	24 Jan 2005 09:45:27 -0000	1.11
***************
*** 795,799 ****
  	WCHAR *servername=NULL, *processorname=NULL;
  	PyObject *observername, *obprocessorname;
! 	DWORD level=1, bufsize=0, bytes_needed, return_cnt;
  	PyObject *ret=NULL, *tuple_item;
  	// @pyparm string/<o PyUnicode>|ServerName||Name of print server, use None for local machine
--- 795,799 ----
  	WCHAR *servername=NULL, *processorname=NULL;
  	PyObject *observername, *obprocessorname;
! 	DWORD level=1, bufsize=0, bytes_needed, return_cnt, buf_ind;
  	PyObject *ret=NULL, *tuple_item;
  	// @pyparm string/<o PyUnicode>|ServerName||Name of print server, use None for local machine
***************
*** 824,828 ****
  		goto done;
  	di1=(DATATYPES_INFO_1W *)buf;
! 	for (DWORD buf_ind=0; buf_ind<return_cnt; buf_ind++){
  		tuple_item=PyWinObject_FromWCHAR(di1->pName);
  		if (tuple_item==NULL){
--- 824,828 ----
  		goto done;
  	di1=(DATATYPES_INFO_1W *)buf;
! 	for (buf_ind=0; buf_ind<return_cnt; buf_ind++){
  		tuple_item=PyWinObject_FromWCHAR(di1->pName);
  		if (tuple_item==NULL){
***************
*** 847,851 ****
  static PyObject *PyEnumPrinterDrivers(PyObject *self, PyObject *args)
  {
! 	DWORD level=1, bufsize=0, bytes_needed, return_cnt;
  	LPBYTE buf=NULL;
  	DRIVER_INFO_1W *di1;
--- 847,851 ----
  static PyObject *PyEnumPrinterDrivers(PyObject *self, PyObject *args)
  {
! 	DWORD level=1, bufsize=0, bytes_needed, return_cnt, i;
  	LPBYTE buf=NULL;
  	DRIVER_INFO_1W *di1;
***************
*** 891,895 ****
  		case 1:{
  			di1=(DRIVER_INFO_1W *)buf;
! 			for (DWORD i=0; i<return_cnt; i++){
  				tuple_item=Py_BuildValue("{s:u}","Name",di1->pName);
  				if (tuple_item==NULL){
--- 891,895 ----
  		case 1:{
  			di1=(DRIVER_INFO_1W *)buf;
! 			for (i=0; i<return_cnt; i++){
  				tuple_item=Py_BuildValue("{s:u}","Name",di1->pName);
  				if (tuple_item==NULL){
***************
*** 904,908 ****
  		case 2:
  			di2=(DRIVER_INFO_2W *)buf;
! 			for (DWORD i=0; i<return_cnt; i++){
  				tuple_item=Py_BuildValue("{s:l,s:u,s:u,s:u,s:u,s:u}",
  					"Version",di2->cVersion,
--- 904,908 ----
  		case 2:
  			di2=(DRIVER_INFO_2W *)buf;
! 			for (i=0; i<return_cnt; i++){
  				tuple_item=Py_BuildValue("{s:l,s:u,s:u,s:u,s:u,s:u}",
  					"Version",di2->cVersion,
***************
*** 923,927 ****
  		case 3:
  			di3=(DRIVER_INFO_3W *)buf;
! 			for (DWORD i=0; i<return_cnt; i++){
  				tuple_item=Py_BuildValue("{s:l,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:u}",
  					"Version",di3->cVersion,
--- 923,927 ----
  		case 3:
  			di3=(DRIVER_INFO_3W *)buf;
! 			for (i=0; i<return_cnt; i++){
  				tuple_item=Py_BuildValue("{s:l,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:u}",
  					"Version",di3->cVersion,
***************
*** 946,950 ****
  		case 4:
  			di4=(DRIVER_INFO_4W *)buf;
! 			for (DWORD i=0; i<return_cnt; i++){
  				tuple_item=Py_BuildValue("{s:l,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:u}",
  					"Version",di4->cVersion,
--- 946,950 ----
  		case 4:
  			di4=(DRIVER_INFO_4W *)buf;
! 			for (i=0; i<return_cnt; i++){
  				tuple_item=Py_BuildValue("{s:l,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:u}",
  					"Version",di4->cVersion,
***************
*** 970,974 ****
  		case 5:
  			di5=(DRIVER_INFO_5W *)buf;
! 			for (DWORD i=0; i<return_cnt; i++){
  				tuple_item=Py_BuildValue("{s:l,s:u,s:u,s:u,s:u,s:u,s:l,s:l,s:l}",
  					"Version",di5->cVersion,
--- 970,974 ----
  		case 5:
  			di5=(DRIVER_INFO_5W *)buf;
! 			for (i=0; i<return_cnt; i++){
  				tuple_item=Py_BuildValue("{s:l,s:u,s:u,s:u,s:u,s:u,s:l,s:l,s:l}",
  					"Version",di5->cVersion,
***************
*** 992,996 ****
  		case 6:
  			di6=(DRIVER_INFO_6W *)buf;
! 			for (DWORD i=0; i<return_cnt; i++){
  				tuple_item=Py_BuildValue("{s:l,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:O&,s:L,s:u,s:u,s:u}",
  					"Version",di6->cVersion,
--- 992,996 ----
  		case 6:
  			di6=(DRIVER_INFO_6W *)buf;
! 			for (i=0; i<return_cnt; i++){
  				tuple_item=Py_BuildValue("{s:l,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:u,s:O&,s:L,s:u,s:u,s:u}",
  					"Version",di6->cVersion,
***************
*** 1058,1062 ****
  	PyObject *ret=NULL, *tuple_item;
  	HANDLE hprinter;
! 	DWORD level=1, bufsize=0, bytes_needed=0, return_cnt;
  	FORM_INFO_1W *fi1;
  	LPBYTE buf=NULL;
--- 1058,1062 ----
  	PyObject *ret=NULL, *tuple_item;
  	HANDLE hprinter;
! 	DWORD level=1, bufsize=0, bytes_needed=0, return_cnt, buf_ind;
  	FORM_INFO_1W *fi1;
  	LPBYTE buf=NULL;
***************
*** 1086,1090 ****
  		goto done;
  	fi1=(FORM_INFO_1W *)buf;
! 	for (DWORD buf_ind=0; buf_ind<return_cnt; buf_ind++){
  		tuple_item=PyWin_Object_FromFORM_INFO_1(fi1);
  		if (tuple_item==NULL){
--- 1086,1090 ----
  		goto done;
  	fi1=(FORM_INFO_1W *)buf;
! 	for (buf_ind=0; buf_ind<return_cnt; buf_ind++){
  		tuple_item=PyWin_Object_FromFORM_INFO_1(fi1);
  		if (tuple_item==NULL){