[pywin32-checkins] pywin32/win32/src/win32print win32print.cpp, 1.23, 1.24

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

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

Modified Files:
	win32print.cpp 
Log Message:
Move function to convert consecutive strings into pywintypes

Index: win32print.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32print/win32print.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** win32print.cpp	9 Dec 2006 02:56:36 -0000	1.23
--- win32print.cpp	14 Mar 2007 04:29:35 -0000	1.24
***************
*** 1334,1365 ****
  	return ret;
  }
- 
- PyObject * PyWinObject_FromWCHARMultiple(WCHAR *multistring)
- {
- 	PyObject *obelement, *ret=NULL;
- 	// takes a consecutive sequence of NULL terminated unicode strings,
- 	// terminated by an additional NULL and returns a list
- 	int elementlen;
- 	if (multistring==NULL){
- 		Py_INCREF(Py_None);
- 		return Py_None;
- 		}
- 	ret=PyList_New(0);
- 	if (ret==NULL)
- 		return NULL;
- 	elementlen=wcslen(multistring);
- 	do{
- 		obelement=PyWinObject_FromWCHAR(multistring, elementlen);
- 		if ((obelement==NULL)||(PyList_Append(ret,obelement)==-1)){
- 			Py_DECREF(ret);
- 			return NULL;
- 			}
- 		Py_DECREF(obelement);
- 		multistring+=elementlen+1;
- 		elementlen=wcslen(multistring);
- 		}
- 	while (elementlen>0);
- 	return ret;
- }
  		
  // @pymethod (dict,...)|win32print|EnumPrinterDrivers|Lists installed printer drivers
--- 1334,1337 ----
***************
*** 1446,1450 ****
  			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:O&,s:u,s:u}",
  					"Version",di3->cVersion,
  					"Name",di3->pName,
--- 1418,1422 ----
  			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:N,s:u,s:u}",
  					"Version",di3->cVersion,
  					"Name",di3->pName,
***************
*** 1454,1458 ****
  					"ConfigFile",di3->pConfigFile,
  					"HelpFile", di3->pHelpFile,
! 					"DependentFiles",PyWinObject_FromWCHARMultiple,di3->pDependentFiles,
  					"MonitorName",di3->pMonitorName,
  					"DefaultDataType",di3->pDefaultDataType);
--- 1426,1430 ----
  					"ConfigFile",di3->pConfigFile,
  					"HelpFile", di3->pHelpFile,
! 					"DependentFiles",PyWinObject_FromMultipleString(di3->pDependentFiles),
  					"MonitorName",di3->pMonitorName,
  					"DefaultDataType",di3->pDefaultDataType);
***************
*** 1469,1473 ****
  			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:O&,s:u,s:u,s:u}",
  					"Version",di4->cVersion,
  					"Name",di4->pName,
--- 1441,1445 ----
  			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:N,s:u,s:u,s:u}",
  					"Version",di4->cVersion,
  					"Name",di4->pName,
***************
*** 1477,1481 ****
  					"ConfigFile",di4->pConfigFile,
  					"HelpFile", di4->pHelpFile,
! 					"DependentFiles",PyWinObject_FromWCHARMultiple,di4->pDependentFiles,
  					"MonitorName",di4->pMonitorName,
  					"DefaultDataType",di4->pDefaultDataType,
--- 1449,1453 ----
  					"ConfigFile",di4->pConfigFile,
  					"HelpFile", di4->pHelpFile,
! 					"DependentFiles",PyWinObject_FromMultipleString(di4->pDependentFiles),
  					"MonitorName",di4->pMonitorName,
  					"DefaultDataType",di4->pDefaultDataType,
***************
*** 1515,1519 ****
  			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:O&,s:u,s:u,s:u,s:O&,s:L,s:u,s:u,s:u}",
  					"Version",di6->cVersion,
  					"Name",di6->pName,
--- 1487,1491 ----
  			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:N,s:u,s:u,s:u,s:O&,s:L,s:u,s:u,s:u}",
  					"Version",di6->cVersion,
  					"Name",di6->pName,
***************
*** 1523,1527 ****
  					"ConfigFile",di6->pConfigFile,
  					"HelpFile", di6->pHelpFile,
! 					"DependentFiles",PyWinObject_FromWCHARMultiple,di6->pDependentFiles,
  					"MonitorName",di6->pMonitorName,
  					"DefaultDataType",di6->pDefaultDataType,
--- 1495,1499 ----
  					"ConfigFile",di6->pConfigFile,
  					"HelpFile", di6->pHelpFile,
! 					"DependentFiles",PyWinObject_FromMultipleString(di6->pDependentFiles),
  					"MonitorName",di6->pMonitorName,
  					"DefaultDataType",di6->pDefaultDataType,