testprogs: add support for "print" option in win32 spoolss torture test.

Guenther

6 files changed, 666 insertions, 4 deletions

diff --git a/testprogs/win32/spoolss/Makefile b/testprogs/win32/spoolss/Makefile
index 96efceacf4..8c9d71683e 100644
--- a/testprogs/win32/spoolss/Makefile
+++ b/testprogs/win32/spoolss/Makefile
@@ -22,6 +22,8 @@ cleantmp:
 # helpers
 ###############################
 
+printlib.obj: printlib.c
+
 error.obj: error.c
 
 torture.obj: torture.c
@@ -32,7 +34,7 @@ torture.obj: torture.c
 
 spoolss.obj: spoolss.c
 
-spoolss.exe: spoolss.obj error.obj torture.obj
-	cl $(CFLAGS) /Fe$@ spoolss.obj error.obj torture.obj \
+spoolss.exe: spoolss.obj printlib.obj error.obj torture.obj
+	cl $(CFLAGS) /Fe$@ spoolss.obj printlib.obj error.obj torture.obj \
 	/link /incremental:no /subsystem:console $(LIBS) $(WINSPOOL_LIBS)
 
diff --git a/testprogs/win32/spoolss/Makefile.mingw b/testprogs/win32/spoolss/Makefile.mingw
index 82fc7ed488..4ff7155250 100644
--- a/testprogs/win32/spoolss/Makefile.mingw
+++ b/testprogs/win32/spoolss/Makefile.mingw
@@ -14,9 +14,10 @@ ctags:
 	ctags --c-kinds=-p -a `find /usr/i686-pc-mingw32/sys-root/mingw/include -name "*.[ch]" | grep -v /CVS/`
 
 proto:
+	mkproto.pl printlib.c --private=printlib_proto.h --public=printlib_proto_pub.h --srcdir=. --builddir=.
 	mkproto.pl torture.c --private=torture_proto.h --public=torture_proto_pub.h --srcdir=. --builddir=.
 
-spoolss.exe: spoolss.c torture.c error.c
+spoolss.exe: spoolss.c printlib.c torture.c error.c
 	@echo Compiling spoolss.exe
-	@$(CC) $(CFLAGS) $(LDFLAGS) spoolss.c torture.c error.c $(LIBS) -o spoolss.exe
+	@$(CC) $(CFLAGS) $(LDFLAGS) spoolss.c printlib.c torture.c error.c $(LIBS) -o spoolss.exe
 
diff --git a/testprogs/win32/spoolss/printlib.c b/testprogs/win32/spoolss/printlib.c
new file mode 100644
index 0000000000..c40ca6c2e1
--- /dev/null
+++ b/testprogs/win32/spoolss/printlib.c
@@ -0,0 +1,608 @@
+/*
+   Unix SMB/CIFS implementation.
+   test suite for spoolss rpc operations
+
+   Copyright (C) Gerald (Jerry) Carter 2007
+   Copyright (C) Guenther Deschner 2009-2010
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <windows.h>
+#include <stdio.h>
+
+void print_devmode(DEVMODE *pDevModeIn)
+{
+	if (pDevModeIn == NULL) {
+		printf("\tDevice Mode\t= (null)\n");
+		return;
+	}
+
+	printf("\tDEVMODE:----------\n");
+	printf("\tDeviceName:      [%s]\n", pDevModeIn->dmDeviceName);
+	printf("\tSpecVersion:     %d\n",   pDevModeIn->dmSpecVersion);
+	printf("\tDriverVersion:   %d\n",   pDevModeIn->dmDriverVersion);
+	printf("\tSize:            %d\n",   pDevModeIn->dmSize);
+	printf("\tDriverExtra:     %d\n",   pDevModeIn->dmDriverExtra);
+	printf("\tFields:          0x%x\n", pDevModeIn->dmFields);
+
+	if (pDevModeIn->dmFields & DM_ORIENTATION)
+		printf("\tOrientation:     %d\n", pDevModeIn->dmOrientation);
+	if (pDevModeIn->dmFields & DM_PAPERSIZE)
+		printf("\tPaperSize:       %d\n", pDevModeIn->dmPaperSize);
+	if (pDevModeIn->dmFields & DM_PAPERLENGTH)
+		printf("\tPaperLength:     %d\n", pDevModeIn->dmPaperLength);
+	if (pDevModeIn->dmFields & DM_PAPERWIDTH)
+		printf("\tPaperWidth:      %d\n", pDevModeIn->dmPaperWidth);
+//	if (pDevModeIn->dmFields & DM_POSITION)
+//		printf("\tPosition:        %d\n", pDevModeIn->dmPosition);
+	if (pDevModeIn->dmFields & DM_SCALE)
+		printf("\tScale:           %d\n", pDevModeIn->dmScale);
+	if (pDevModeIn->dmFields & DM_COPIES)
+		printf("\tCopies:          %d\n", pDevModeIn->dmCopies );
+	if (pDevModeIn->dmFields & DM_DEFAULTSOURCE)
+		printf("\tDefaultSource:   %d\n", pDevModeIn->dmDefaultSource);
+	if (pDevModeIn->dmFields & DM_PRINTQUALITY)
+		printf("\tPrintQuality:    %d\n", pDevModeIn->dmPrintQuality);
+	if (pDevModeIn->dmFields & DM_COLOR)
+		printf("\tColor:           %d\n", pDevModeIn->dmColor);
+	if (pDevModeIn->dmFields & DM_DUPLEX)
+		printf("\tDuplex:          %d\n", pDevModeIn->dmDuplex);
+	if (pDevModeIn->dmFields & DM_YRESOLUTION)
+		printf("\tYResolution:     %d\n", pDevModeIn->dmYResolution);
+	if (pDevModeIn->dmFields & DM_TTOPTION)
+		printf("\tTTOption:        %d\n", pDevModeIn->dmTTOption);
+	if (pDevModeIn->dmFields & DM_COLLATE)
+		printf("\tCollate:         %d\n", pDevModeIn->dmCollate);
+	if (pDevModeIn->dmFields & DM_FORMNAME)
+		printf("\tForm:            [%s]\n", pDevModeIn->dmFormName);
+	if (pDevModeIn->dmFields & DM_LOGPIXELS)
+		printf("\tLogPixels:       %d\n", pDevModeIn->dmLogPixels);
+	if (pDevModeIn->dmFields & DM_BITSPERPEL)
+		printf("\tBitsPerPel:      %d\n", pDevModeIn->dmBitsPerPel);
+	if (pDevModeIn->dmFields & DM_PELSWIDTH)
+		printf("\tPelsWidth:       %d\n", pDevModeIn->dmPelsWidth);
+	if (pDevModeIn->dmFields & DM_PELSHEIGHT)
+		printf("\tPelsHeight:      %d\n", pDevModeIn->dmPelsHeight);
+	if (pDevModeIn->dmFields & DM_DISPLAYFLAGS)
+		printf("\tDisplayFlags:    %d\n", pDevModeIn->dmDisplayFlags);
+//	if (pDevModeIn->dmFields & DM_NUP)
+//		printf("\tNup:             %d\n", pDevModeIn->dmNup);
+	if (pDevModeIn->dmFields & DM_DISPLAYFREQUENCY)
+		printf("\tDisplayFrequency:%d\n", pDevModeIn->dmDisplayFrequency);
+	if (pDevModeIn->dmFields & DM_ICMMETHOD)
+		printf("\tICMMethod:       %d\n", pDevModeIn->dmICMMethod);
+	if (pDevModeIn->dmFields & DM_ICMINTENT)
+		printf("\tICMIntent:       %d\n", pDevModeIn->dmICMIntent);
+	if (pDevModeIn->dmFields & DM_MEDIATYPE)
+		printf("\tMediaType:       %d\n", pDevModeIn->dmMediaType);
+	if (pDevModeIn->dmFields & DM_DITHERTYPE)
+		printf("\tDitherType:      %d\n", pDevModeIn->dmDitherType);
+//	if (pDevModeIn->dmFields & DM_PANNINGWIDTH)
+//		printf("\tPanningWidth:    %d\n", pDevModeIn->dmPanningWidth);
+//	if (pDevModeIn->dmFields & DM_PANNINGHEIGHT)
+//		printf("\tPanningHeight:   %d\n", pDevModeIn->dmPanningHeight);
+
+#if 0
+	if (bForceIn) {
+		printf("DEVMODE\n");
+		Dump((BYTE*)pDevModeIn, sizeof(DEVMODE), LEADER);
+
+		if (pDevModeIn->dmDriverExtra) {
+			printf("DriverExtra\n");
+			Dump((BYTE*)pDevModeIn + sizeof(DEVMODE), pDevModeIn->dmDriverExtra, LEADER);
+		}
+	}
+#endif
+
+	return;
+}
+
+void print_acl(const char* str, ACL *acl)
+{
+	printf("%s\n", str);
+	if (acl == NULL)
+		return;
+
+	printf("\t\tACL Revision \t\t 0x%x\n", acl->AclRevision);
+	printf("\t\tSbz1\t\t 0x%x\n", acl->Sbz1);
+	printf("\t\tSbz2\t\t 0x%x\n", acl->Sbz2);
+	printf("\t\tACL Size\t\t 0x%x\n", acl->AclSize);
+	printf("\t\tACL Count\t\t 0x%x\n", acl->AceCount);
+
+	return;
+}
+
+void print_sid(const char* str, SID *sid)
+{
+	DWORD	i = 0;
+
+	printf("%s\n", str);
+	printf("0x%x\n", sid);
+	if (sid == NULL)
+		return;
+	printf("\t\tRevision\t\t0x%x\n", sid->Revision);
+	printf("\t\tSubAuthorityCount\t0x%x\n", sid->SubAuthorityCount);
+	printf("\t\tSubAuthority\n\t");
+	while (i < sid->SubAuthorityCount) {
+		printf("\t0x%x", sid->SubAuthority[i]);
+		if (i%4 == 3)
+			printf("\n\t");
+		i++;
+	}
+
+	return;
+}
+
+void print_secdesc(SECURITY_DESCRIPTOR *secdesc)
+{
+	if (secdesc == NULL) {
+		printf("\tSecurity Descriptor\t= (null)\n");
+		return;
+	}
+
+	printf("\tRevision\t= 0x%x\n", secdesc->Revision);
+	printf("\tSbz1\t\t= 0x%x\n", secdesc->Sbz1);
+#if 0
+	print_sid("\tOwner\t\t= ", secdesc->Owner);
+	print_sid("\tGroup\t\t= ",secdesc->Group);
+	print_acl("\tSacl\t\t= ", secdesc->Sacl);
+	print_acl("\tDacl\t\t= ", secdesc->Dacl);
+#endif
+	return;
+}
+
+void PrintLastError()
+{
+	LPVOID lpMsgBuf;
+	DWORD status;
+
+	status = GetLastError();
+
+	FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+		      NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+		      (LPTSTR)&lpMsgBuf, 0, NULL);
+	printf("ERROR  [0x%x] : %s\n", status, (char*)lpMsgBuf);
+	LocalFree(lpMsgBuf);
+
+	return;
+}
+
+
+void print_job_info_1(PJOB_INFO_1 info)
+{
+	printf("\tJob ID\t\t= %d\n",		info->JobId);
+	printf("\tPrinter Name\t= %s\n",	info->pPrinterName);
+	printf("\tMachine Name\t= %s\n",	info->pMachineName);
+	printf("\tUser Name\t= %s\n",		info->pUserName);
+	printf("\tDocument\t= %s\n",		info->pDocument);
+	printf("\tDatatype\t= %s\n",		info->pDatatype);
+	printf("\tStatus\t\t= %s\n",		info->pStatus);
+	printf("\tStatus\t= %d\n",		info->Status);
+	printf("\tPriority\t= %d\n",		info->Priority);
+	printf("\tPosition\t= %d\n",		info->Position);
+	printf("\tTotal Pages\t= %d\n",	info->TotalPages);
+	printf("\tPages Printed\t= %d\n",	info->PagesPrinted);
+	printf("\tSubmitted (DD:MM:YY HH:MM:SS)\t= %d:%d:%d %d:%d:%d UTC\n",
+		info->Submitted.wDay, info->Submitted.wMonth,
+		info->Submitted.wYear, info->Submitted.wHour,
+		info->Submitted.wMinute, info->Submitted.wSecond);
+
+	return;
+}
+
+void print_job_info_2(PJOB_INFO_2 info)
+{
+	printf("\tJob ID\t\t= %d\n",		info->JobId);
+	printf("\tPrinter Name\t= %s\n",	info->pPrinterName);
+	printf("\tMachine Name\t= %s\n",	info->pMachineName);
+	printf("\tUser Name\t= %s\n",		info->pUserName);
+	printf("\tDocument\t= %s\n",		info->pDocument);
+	printf("\tDatatype\t= %s\n",		info->pDatatype);
+	printf("\tNotify Name\t= %s\n",		info->pNotifyName);
+	printf("\tPrint Processor\t= %s\n",	info->pPrintProcessor);
+	printf("\tParameters\t= %s\n",		info->pParameters);
+	printf("\tDriver Name\t= %s\n",		info->pDriverName);
+	printf("\tStatus\t\t= %s\n",		info->pStatus);
+	printf("\tStatus\t\t= %d\n",		info->Status);
+	printf("\tPriority\t= %d\n",		info->Priority);
+	printf("\tPosition\t= %d\n",		info->Position);
+	printf("\tTotal Pages\t= %d\n",		info->TotalPages);
+	printf("\tPages Printed\t= %d\n",	info->PagesPrinted);
+	printf("\tStart Time\t= %d\n",		info->StartTime);
+	printf("\tUntil Time\t= %d\n",		info->UntilTime);
+	printf("\tTime\t\t= %d\n",		info->Time);
+	printf("\tSize\t\t= %d\n",		info->Size);
+	printf("\tSubmitted (DD:MM:YY HH:MM:SS)\t= %d:%d:%d %d:%d:%d UTC\n",
+		info->Submitted.wDay, info->Submitted.wMonth,
+		info->Submitted.wYear, info->Submitted.wHour,
+		info->Submitted.wMinute, info->Submitted.wSecond);
+	printf("\tDevice Mode Information\n");
+	printf("\t-----------------------\n");
+	print_devmode(info->pDevMode);
+	printf("\tSecurity Descriptor Information\n");
+	printf("\t-------------------------------\n");
+	print_secdesc(info->pSecurityDescriptor);
+
+	return;
+}
+
+void print_job_info_3(PJOB_INFO_3 info)
+{
+	printf("\tJob ID\t\t= %d\n",		info->JobId);
+	printf("\tJob ID Next Job\t= %d\n",	info->NextJobId);
+	printf("\tReserved (must be 0)\t= %d\n",info->Reserved);
+
+	return;
+}
+
+void print_monitor_info_1(PMONITOR_INFO_1 info)
+{
+	printf("\tMonitor Name\t= %s\n",	info->pName);
+
+	return;
+}
+
+void print_monitor_info_2(PMONITOR_INFO_2 info)
+{
+	printf("\tMonitor Name\t= %s\n",	info->pName);
+	printf("\tEnvironment\t= %s\n",		info->pEnvironment);
+	printf("\tDLL Name\t= %s\n",		info->pDLLName);
+
+	return;
+}
+
+void print_form_info_1(PFORM_INFO_1 info)
+{
+	printf("\tForm Name\t= %s\n",	info->pName);
+	printf("\tFlags\t\t= 0x%x\n",	info->Flags);
+	printf("\tSize\t\t= %d x %d\n", info->Size.cx, info->Size.cy);
+	printf("\tRectangle\t= [left]%d [right]%d [top]%d [bottom]%d\n",
+			info->ImageableArea.left, info->ImageableArea.right,
+			info->ImageableArea.top, info->ImageableArea.bottom);
+
+	return;
+}
+
+void print_printer_info_1(PPRINTER_INFO_1 info)
+{
+	printf("\tPrinter Name\t= %s\n",	info->pName);
+	printf("\tDescription\t= %s\n",		info->pDescription);
+	printf("\tComment\t\t= %s\n",		info->pComment);
+	printf("\tFlags\t\t= 0x%x\n",		info->Flags);
+
+	return;
+}
+
+void print_printer_info_2(PPRINTER_INFO_2 info)
+{
+	printf("\tServer Name\t\t= %s\n",	info->pServerName);
+	printf("\tPrinter Name\t\t= %s\n",	info->pPrinterName);
+	printf("\tPort Name\t\t= %s\n",		info->pPortName);
+	printf("\tShare Name\t\t= %s\n",	info->pShareName);
+	printf("\tDriver Name\t\t= %s\n",	info->pDriverName);
+	printf("\tComment\t\t\t= %s\n",		info->pComment);
+	printf("\tLocation\t\t= %s\n",		info->pLocation);
+	printf("\tSeparator File\t\t= %s\n",	info->pSepFile);
+	printf("\tDefault Data Type\t= %s\n",	info->pDatatype);
+	printf("\tPrint Processor\t\t= %s\n",	info->pPrintProcessor);
+	printf("\tParameters\t\t= %s\n",	info->pParameters);
+	printf("\tAttributes\t\t= 0x%x\n",	info->Attributes);
+	printf("\tPriority\t\t= 0x%x\n",	info->Priority);
+	printf("\tDefault Priority\t= 0x%x\n",	info->DefaultPriority);
+	printf("\tStart Time\t\t= 0x%x\n",	info->StartTime);
+	printf("\tUntil Time\t\t= 0x%x\n",	info->UntilTime);
+	printf("\tStatus\t\t\t= 0x%x\n",	info->Status);
+	printf("\tcJobs\t\t\t= 0x%x\n",		info->cJobs);
+	printf("\tAverage PPM\t\t= 0x%x\n",	info->AveragePPM);
+
+	printf("\tDevice Mode Information\n");
+	printf("\t-----------------------\n");
+	print_devmode(info->pDevMode);
+#if 0
+	printf("\tSecurity Descriptor Information\n");
+	printf("\t-------------------------------\n");
+	print_secdesc(info->pSecurityDescriptor);
+#endif
+	return;
+}
+
+void print_printer_info_5(PPRINTER_INFO_5 info)
+{
+	printf("\tPrinter Name\t\t\t= %s\n",		info->pPrinterName);
+	printf("\tPort Name\t\t\t= %s\n",		info->pPortName);
+	printf("\tAttributes\t\t\t= 0x%x\n",		info->Attributes);
+	printf("\tDev NotSelect Timeout\t= 0x%x\n",	info->DeviceNotSelectedTimeout);
+	printf("\tTX RetryTimeout\t\t= 0x%x\n",		info->TransmissionRetryTimeout);
+	return;
+}
+
+void print_printer_info_6(PPRINTER_INFO_6 info)
+{
+	printf("\tStatus\t\t\t= 0x%x\n",		info->dwStatus);
+	return;
+}
+
+void print_printer_info_7(PPRINTER_INFO_7 info)
+{
+	printf("\tObject GUID\t\t\t= %s\n",		info->pszObjectGUID);
+	printf("\tAction\t\t\t= 0x%x\n",		info->dwAction);
+	return;
+}
+
+void print_printer_info_8(PPRINTER_INFO_8 info)
+{
+	print_devmode(info->pDevMode);
+}
+
+void print_printer_info_9(PPRINTER_INFO_9 info)
+{
+	print_devmode(info->pDevMode);
+}
+
+void print_printer_info_bylevel(DWORD level, LPBYTE buffer, DWORD count)
+{
+	DWORD i;
+	PPRINTER_INFO_1	buffer1 = NULL;
+	PPRINTER_INFO_2	buffer2 = NULL;
+	PPRINTER_INFO_3	buffer3 = NULL;
+	PPRINTER_INFO_4	buffer4 = NULL;
+	PPRINTER_INFO_5	buffer5 = NULL;
+	PPRINTER_INFO_6	buffer6 = NULL;
+	PPRINTER_INFO_7	buffer7 = NULL;
+	PPRINTER_INFO_8	buffer8 = NULL;
+
+	if (!buffer) {
+		return;
+	}
+
+	switch (level) {
+	case 1:
+		buffer1 = (PPRINTER_INFO_1)buffer;
+		break;
+	case 2:
+		buffer2 = (PPRINTER_INFO_2)buffer;
+		break;
+	case 3:
+		buffer3 = (PPRINTER_INFO_3)buffer;
+		break;
+	case 4:
+		buffer4 = (PPRINTER_INFO_4)buffer;
+		break;
+	case 5:
+		buffer5 = (PPRINTER_INFO_5)buffer;
+		break;
+	case 6:
+		buffer6 = (PPRINTER_INFO_6)buffer;
+		break;
+	case 7:
+		buffer7 = (PPRINTER_INFO_7)buffer;
+		break;
+	case 8:
+		buffer8 = (PPRINTER_INFO_8)buffer;
+		break;
+	default:
+		break;
+	}
+
+	printf("Printer Info Level %d:\n", level);
+
+	switch (level) {
+	case 1:
+		for (i=0; i<count; i++) {
+			print_printer_info_1(&buffer1[i]);
+			printf("\n");
+		}
+		break;
+	case 2:
+		for (i=0; i<count; i++) {
+			print_printer_info_2(&buffer2[i]);
+			printf("\n");
+		}
+		break;
+#if 0
+	case 3:
+		for (i=0; i<count; i++) {
+			print_printer_info_3(&buffer3[i]);
+			printf("\n");
+		}
+		break;
+	case 4:
+		for (i=0; i<count; i++) {
+			print_printer_info_4(&buffer4[i]);
+			printf("\n");
+		}
+		break;
+#endif
+	case 5:
+		for (i=0; i<count; i++) {
+			print_printer_info_5(&buffer5[i]);
+			printf("\n");
+		}
+		break;
+	case 6:
+		for (i=0; i<count; i++) {
+			print_printer_info_6(&buffer6[i]);
+			printf("\n");
+		}
+		break;
+	case 7:
+		for (i=0; i<count; i++) {
+			print_printer_info_7(&buffer7[i]);
+			printf("\n");
+		}
+		break;
+	case 8:
+		for (i=0; i<count; i++) {
+			print_printer_info_8(&buffer8[i]);
+			printf("\n");
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+void print_printprocessor_info_1(PPRINTPROCESSOR_INFO_1 info)
+{
+	printf("\tPrint Processor Name\t= %s\n", info->pName);
+
+	return;
+}
+
+void print_driver_info_1(PDRIVER_INFO_1 info)
+{
+	printf("\tDriver Name\t= %s\n\n",	info->pName);
+
+	return;
+}
+
+void print_driver_info_2(PDRIVER_INFO_2 info)
+{
+	printf("\tDriver Name\t= %s\n",		info->pName);
+	printf("\tEnvironment\t= %s\n",		info->pEnvironment);
+	printf("\tVersion\t\t= %d\n",		info->cVersion);
+	printf("\tDriver Path\t= %s\n",		info->pDriverPath);
+	printf("\tData File\t= %s\n",		info->pDataFile);
+	printf("\tConfig File\t= %s\n\n",	info->pConfigFile);
+
+	return;
+}
+
+void print_driver_info_3(PDRIVER_INFO_3 info)
+{
+	char *ptr = NULL;
+
+	printf("\tDriver Name\t= %s\n",		info->pName);
+	printf("\tEnvironment\t= %s\n",		info->pEnvironment);
+	printf("\tVersion\t\t= %d\n",		info->cVersion);
+	printf("\tDriver Path\t= %s\n",		info->pDriverPath);
+	printf("\tData File\t= %s\n",		info->pDataFile);
+	printf("\tConfig File\t= %s\n",		info->pConfigFile);
+	printf("\tHelp Path\t= %s\n",		info->pHelpFile);
+	printf("\tMonitor Name\t= %s\n",	info->pMonitorName);
+	printf("\tData Type\t= %s\n",		info->pDefaultDataType);
+	ptr = (char*)info->pDependentFiles;
+	while ((ptr != NULL) && (*ptr != '\0')) {
+		printf("\tDependent Files\t= %s\n", ptr);
+		for (;*ptr != '\0'; ptr++)
+			/* printf("%s\n", ptr); */
+			;
+		ptr++;
+	}
+
+	return;
+}
+
+void print_driver_info_4(PDRIVER_INFO_4 info)
+{
+	char *ptr = NULL;
+
+	printf("\tDriver Name\t= %s\n",		info->pName);
+	printf("\tEnvironment\t= %s\n",		info->pEnvironment);
+	printf("\tVersion\t\t= %d\n",		info->cVersion);
+	printf("\tDriver Path\t= %s\n",		info->pDriverPath);
+	printf("\tData File\t= %s\n",		info->pDataFile);
+	printf("\tConfig File\t= %s\n",		info->pConfigFile);
+	printf("\tHelp Path\t= %s\n",		info->pHelpFile);
+	printf("\tMonitor Name\t= %s\n",	info->pMonitorName);
+	printf("\tData Type\t= %s\n",		info->pDefaultDataType);
+	printf("\tPrevious Names\t= %s\n",	info->pszzPreviousNames);
+	ptr = (char*)info->pDependentFiles;
+	while ((ptr != NULL) && (*ptr != '\0')) {
+		printf("\tDependent Files\t= %s\n", ptr);
+		for (;*ptr != '\0'; ptr++)
+			/* printf("%s\n", ptr); */
+			;
+		ptr++;
+	}
+
+	return;
+}
+
+void print_driver_info_6(PDRIVER_INFO_6 info)
+{
+	char *ptr = NULL;
+
+	printf("\tDriver Name\t= %s\n",		info->pName);
+	printf("\tEnvironment\t= %s\n",		info->pEnvironment);
+	printf("\tVersion\t\t= %d\n",		info->cVersion);
+	printf("\tDriver Path\t= %s\n",		info->pDriverPath);
+	printf("\tData File\t= %s\n",		info->pDataFile);
+	printf("\tConfig File\t= %s\n",		info->pConfigFile);
+	printf("\tHelp Path\t= %s\n",		info->pHelpFile);
+	printf("\tMonitor Name\t= %s\n",	info->pMonitorName);
+	printf("\tData Type\t= %s\n",		info->pDefaultDataType);
+	printf("\tPrevious Names\t= %s\n",	info->pszzPreviousNames);
+	ptr = (char*)info->pDependentFiles;
+	if (ptr != NULL) {
+		while (*ptr != '\0') {
+			printf("\tDependent Files\t= %s\n", ptr);
+			for (;*ptr != '\0'; ptr++)
+				/* printf("%s\n", ptr); */
+				;
+			ptr++;
+		}
+	} else {
+		printf("\tPrevious Names\t= (null)\n");
+	}
+
+	ptr = (char*)info->pszzPreviousNames;
+	if (ptr != NULL) {
+		while (*ptr != '\0') {
+			printf("\tPrevious Names\t= %s\n", ptr);
+			for (;*ptr != '\0'; ptr++)
+				/* printf("%s\n", ptr); */
+				;
+			ptr++;
+		}
+	} else {
+		printf("\tPrevious Names\t= (null)\n");
+	}
+
+	printf("\tDriver Date\t= %d\n",		info->ftDriverDate);
+	printf("\tDriver Version\t= %d\n",	info->dwlDriverVersion);
+	printf("\tManufacture Name = %s\n",	info->pszMfgName);
+	printf("\tOEM URL\t\t= %s\n",		info->pszOEMUrl);
+	printf("\tHardware ID\t= %s\n",		info->pszHardwareID);
+	printf("\tProvider\t= %s\n",		info->pszProvider);
+	return;
+}
+
+void print_doc_info_1(PDOC_INFO_1 info)
+{
+	printf("\tDocument Name\t= %s\n",	info->pDocName);
+	printf("\tOutput Filename\t= %s\n",	info->pOutputFile);
+	printf("\tDatatype\t= %s\n",		info->pDatatype);
+	return;
+}
+
+void print_printer_enum_values(PRINTER_ENUM_VALUES *info)
+{
+	DWORD i = 0;
+
+	printf("\tValue Name\t= %s [0x%x]\n",	info->pValueName, info->cbValueName);
+	printf("\tType\t\t= 0x%x\n",		info->dwType);
+	printf("\tSize\t\t= 0x%x\n",		info->cbData);
+
+	while (i < info->cbData) {
+		printf("\t0x%x", *(info->pData++));
+		if (i%4 == 3)
+			printf("\n");
+		i++;
+	}
+	printf("\n");
+
+	return;
+}
diff --git a/testprogs/win32/spoolss/printlib_proto.h b/testprogs/win32/spoolss/printlib_proto.h
new file mode 100644
index 0000000000..fd6db22770
--- /dev/null
+++ b/testprogs/win32/spoolss/printlib_proto.h
@@ -0,0 +1,46 @@
+#ifndef __PRINTLIB_H__
+#define __PRINTLIB_H__
+
+#undef _PRINTF_ATTRIBUTE
+#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
+/* This file was automatically generated by mkproto.pl. DO NOT EDIT */
+
+/* this file contains prototypes for functions that are private
+ * to this subsystem or library. These functions should not be
+ * used outside this particular subsystem! */
+
+
+/* The following definitions come from printlib.c  */
+
+void print_devmode (DEVMODE *pDevModeIn);
+void print_acl (const char* str, ACL *acl);
+void print_sid (const char* str, SID *sid);
+void print_secdesc (SECURITY_DESCRIPTOR *secdesc);
+void PrintLastError();
+void print_job_info_1(PJOB_INFO_1 info);
+void print_job_info_2(PJOB_INFO_2 info);
+void print_job_info_3(PJOB_INFO_3 info);
+void print_monitor_info_1 (PMONITOR_INFO_1 info);
+void print_monitor_info_2 (PMONITOR_INFO_2 info);
+void print_form_info_1 (PFORM_INFO_1 info);
+void print_printer_info_1 (PPRINTER_INFO_1 info);
+void print_printer_info_2 (PPRINTER_INFO_2 info);
+void print_printer_info_5 (PPRINTER_INFO_5 info);
+void print_printer_info_6 (PPRINTER_INFO_6 info);
+void print_printer_info_7 (PPRINTER_INFO_7 info);
+void print_printer_info_8 (PPRINTER_INFO_8 info);
+void print_printer_info_9 (PPRINTER_INFO_9 info);
+void print_printer_info_bylevel(DWORD level, LPBYTE buffer, DWORD count);
+void print_printprocessor_info_1 (PPRINTPROCESSOR_INFO_1 info);
+void print_driver_info_1 (PDRIVER_INFO_1 info);
+void print_driver_info_2 (PDRIVER_INFO_2 info);
+void print_driver_info_3 (PDRIVER_INFO_3 info);
+void print_driver_info_4 (PDRIVER_INFO_4 info);
+void print_driver_info_6 (PDRIVER_INFO_6 info);
+void print_doc_info_1 (PDOC_INFO_1 info);
+void print_printer_enum_values (PRINTER_ENUM_VALUES *info);
+#undef _PRINTF_ATTRIBUTE
+#define _PRINTF_ATTRIBUTE(a1, a2)
+
+#endif /* __PRINTLIB_H__ */
+
diff --git a/testprogs/win32/spoolss/spoolss.c b/testprogs/win32/spoolss/spoolss.c
index d014b14e70..c550b99923 100644
--- a/testprogs/win32/spoolss/spoolss.c
+++ b/testprogs/win32/spoolss/spoolss.c
@@ -104,6 +104,10 @@ static BOOL test_EnumPrinters(struct torture_context *tctx,
 			}
 		}
 
+		if (tctx->print) {
+			print_printer_info_bylevel(levels[i], buffer, returned);
+		}
+
 		free(buffer);
 		buffer = NULL;
 	}
diff --git a/testprogs/win32/spoolss/spoolss.h b/testprogs/win32/spoolss/spoolss.h
index adf178670f..f025fccb3f 100644
--- a/testprogs/win32/spoolss/spoolss.h
+++ b/testprogs/win32/spoolss/spoolss.h
@@ -26,6 +26,7 @@
 #include <stdio.h>
 
 #include "error.h"
+#include "printlib_proto.h"
 
 #if 0
 #include "lib/talloc/talloc.h"