[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Tue Feb 9 08:40:07 MST 2010
The branch, master has been updated
via 7c95d55... testprogs: regenerate printlib prototypes for spoolss test.
via 73e6212... testprogs: print job info levels in EnumJobs() spoolss tests.
via bf7156b... testprogs: print datatypes info levels in EnumPrintProcessorDatatypes() spoolss tests.
via dcad544... testprogs: print printprocessor info levels in EnumPrintProcessors() spoolss tests.
via 5db64e8... testprogs: print monitor info levels in EnumMonitors() spoolss tests.
via 5afae25... testprogs: print port info levels in EnumPorts() spoolss tests.
via 8088a17... testprogs: print form info levels in EnumForms(),GetForm() spoolss tests.
from e0472c5... s3:selftest: make selftest requires bash for now
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7c95d559c3583cb1609af1d84ad1002b7f4ef070
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 9 16:16:54 2010 +0100
testprogs: regenerate printlib prototypes for spoolss test.
Guenther
commit 73e6212a32a6392361320ee924a040e3573f9abb
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 9 16:14:45 2010 +0100
testprogs: print job info levels in EnumJobs() spoolss tests.
Guenther
commit bf7156b6dd89a7f4cb33fac4b13d66e9a099661e
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 9 15:59:29 2010 +0100
testprogs: print datatypes info levels in EnumPrintProcessorDatatypes() spoolss tests.
Guenther
commit dcad5447cf32eba0296bdca07668333004cc50ef
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 9 15:54:25 2010 +0100
testprogs: print printprocessor info levels in EnumPrintProcessors() spoolss tests.
Guenther
commit 5db64e88c7f8e1e689e0dabc67db1074eb1fef86
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 9 15:24:34 2010 +0100
testprogs: print monitor info levels in EnumMonitors() spoolss tests.
Guenther
commit 5afae257249d0034d999d5c588732c86732ee9d2
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 9 15:00:54 2010 +0100
testprogs: print port info levels in EnumPorts() spoolss tests.
Guenther
commit 8088a1712868b645e273c35ab06c0511892dd3d3
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 9 14:49:04 2010 +0100
testprogs: print form info levels in EnumForms(),GetForm() spoolss tests.
Guenther
-----------------------------------------------------------------------
Summary of changes:
testprogs/win32/spoolss/printlib.c | 341 ++++++++++++++++++++++++++++++
testprogs/win32/spoolss/printlib_proto.h | 66 ++++---
testprogs/win32/spoolss/spoolss.c | 28 +++
3 files changed, 408 insertions(+), 27 deletions(-)
Changeset truncated at 500 lines:
diff --git a/testprogs/win32/spoolss/printlib.c b/testprogs/win32/spoolss/printlib.c
index 8480e30..ff18517 100644
--- a/testprogs/win32/spoolss/printlib.c
+++ b/testprogs/win32/spoolss/printlib.c
@@ -248,6 +248,103 @@ void print_job_info_3(PJOB_INFO_3 info)
return;
}
+void print_job_info_4(PJOB_INFO_4 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("\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("\tSize High\t\t= 0x%016x\n", info->SizeHigh);
+ 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_bylevel(DWORD level, LPBYTE buffer, DWORD count)
+{
+ DWORD i;
+ PJOB_INFO_1 buffer1 = NULL;
+ PJOB_INFO_2 buffer2 = NULL;
+ PJOB_INFO_3 buffer3 = NULL;
+ PJOB_INFO_4 buffer4 = NULL;
+
+ if (!buffer) {
+ return;
+ }
+
+ switch (level) {
+ case 1:
+ buffer1 = (PJOB_INFO_1)buffer;
+ break;
+ case 2:
+ buffer2 = (PJOB_INFO_2)buffer;
+ break;
+ case 3:
+ buffer3 = (PJOB_INFO_3)buffer;
+ break;
+ case 4:
+ buffer4 = (PJOB_INFO_4)buffer;
+ break;
+ default:
+ break;
+ }
+
+ printf("Job Info Level %d:\n", level);
+
+ switch (level) {
+ case 1:
+ for (i=0; i<count; i++) {
+ print_job_info_1(&buffer1[i]);
+ printf("\n");
+ }
+ break;
+ case 2:
+ for (i=0; i<count; i++) {
+ print_job_info_2(&buffer2[i]);
+ printf("\n");
+ }
+ break;
+ case 3:
+ for (i=0; i<count; i++) {
+ print_job_info_3(&buffer3[i]);
+ printf("\n");
+ }
+ break;
+ case 4:
+ for (i=0; i<count; i++) {
+ print_job_info_4(&buffer4[i]);
+ printf("\n");
+ }
+ break;
+ default:
+ break;
+ }
+}
+
void print_monitor_info_1(PMONITOR_INFO_1 info)
{
printf("\tMonitor Name\t= %s\n", info->pName);
@@ -264,6 +361,122 @@ void print_monitor_info_2(PMONITOR_INFO_2 info)
return;
}
+void print_monitor_info_bylevel(DWORD level, LPBYTE buffer, DWORD count)
+{
+ DWORD i;
+ PMONITOR_INFO_1 buffer1 = NULL;
+ PMONITOR_INFO_2 buffer2 = NULL;
+
+ if (!buffer) {
+ return;
+ }
+
+ switch (level) {
+ case 1:
+ buffer1 = (PMONITOR_INFO_1)buffer;
+ break;
+ case 2:
+ buffer2 = (PMONITOR_INFO_2)buffer;
+ break;
+ default:
+ break;
+ }
+
+ printf("Monitor Info Level %d:\n", level);
+
+ switch (level) {
+ case 1:
+ for (i=0; i<count; i++) {
+ print_monitor_info_1(&buffer1[i]);
+ printf("\n");
+ }
+ break;
+ case 2:
+ for (i=0; i<count; i++) {
+ print_monitor_info_2(&buffer2[i]);
+ printf("\n");
+ }
+ break;
+ default:
+ break;
+ }
+}
+
+void print_port_info_1(PPORT_INFO_1 info)
+{
+ printf("\tPort Name\t= %s\n", info->pName);
+ return;
+}
+
+void print_port_info_2(PPORT_INFO_2 info)
+{
+ printf("\tPort Name\t= %s\n", info->pPortName);
+ printf("\tMonitor Name\t= %s\n",info->pMonitorName);
+ printf("\tDescription\t= %s\n", info->pDescription);
+ printf("\tPort Type\t= 0x%08x\n", info->fPortType);
+ printf("\tReserved\t= 0x%08x\n", info->Reserved);
+ return;
+}
+
+void print_port_info_3(PPORT_INFO_3 info)
+{
+ printf("\tStatus\t= 0x%08x\n", info->dwStatus);
+ printf("\tStatus String\t= %s\n", info->pszStatus);
+ printf("\tSeverity\t= 0x%08x\n", info->dwSeverity);
+ return;
+}
+
+void print_port_info_bylevel(DWORD level, LPBYTE buffer, DWORD count)
+{
+ DWORD i;
+ PPORT_INFO_1 buffer1 = NULL;
+ PPORT_INFO_2 buffer2 = NULL;
+ PPORT_INFO_3 buffer3 = NULL;
+
+ if (!buffer) {
+ return;
+ }
+
+ switch (level) {
+ case 1:
+ buffer1 = (PPORT_INFO_1)buffer;
+ break;
+ case 2:
+ buffer2 = (PPORT_INFO_2)buffer;
+ break;
+ case 3:
+ buffer3 = (PPORT_INFO_3)buffer;
+ break;
+ default:
+ break;
+ }
+
+ printf("Port Info Level %d:\n", level);
+
+ switch (level) {
+ case 1:
+ for (i=0; i<count; i++) {
+ print_port_info_1(&buffer1[i]);
+ printf("\n");
+ }
+ break;
+ case 2:
+ for (i=0; i<count; i++) {
+ print_port_info_2(&buffer2[i]);
+ printf("\n");
+ }
+ break;
+ case 3:
+ for (i=0; i<count; i++) {
+ print_port_info_3(&buffer3[i]);
+ printf("\n");
+ }
+ break;
+ default:
+ break;
+ }
+}
+
void print_form_info_1(PFORM_INFO_1 info)
{
printf("\tForm Name\t= %s\n", info->pName);
@@ -276,6 +489,65 @@ void print_form_info_1(PFORM_INFO_1 info)
return;
}
+void print_form_info_2(PFORM_INFO_2 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);
+ printf("\tKeyword\t= %s\n", info->pKeyword);
+ printf("\tString Type\t= 0x%08x\n", info->StringType);
+ printf("\tMui DLL\t= %s\n", info->pMuiDll);
+ printf("\tResource Id\t= 0x%08x\n", info->dwResourceId);
+ printf("\tDisplay Name\t= %s\n",info->pDisplayName);
+ printf("\tLang Id\t= 0x%04x\n", info->wLangId);
+
+ return;
+}
+
+void print_form_info_bylevel(DWORD level, LPBYTE buffer, DWORD count)
+{
+ DWORD i;
+ PFORM_INFO_1 buffer1 = NULL;
+ PFORM_INFO_2 buffer2 = NULL;
+
+ if (!buffer) {
+ return;
+ }
+
+ switch (level) {
+ case 1:
+ buffer1 = (PFORM_INFO_1)buffer;
+ break;
+ case 2:
+ buffer2 = (PFORM_INFO_2)buffer;
+ break;
+ default:
+ break;
+ }
+
+ printf("Form Info Level %d:\n", level);
+
+ switch (level) {
+ case 1:
+ for (i=0; i<count; i++) {
+ print_form_info_1(&buffer1[i]);
+ printf("\n");
+ }
+ break;
+ case 2:
+ for (i=0; i<count; i++) {
+ print_form_info_2(&buffer2[i]);
+ printf("\n");
+ }
+ break;
+ default:
+ break;
+ }
+}
+
void print_printer_info_1(PPRINTER_INFO_1 info)
{
printf("\tPrinter Name\t= %s\n", info->pName);
@@ -462,6 +734,75 @@ void print_printprocessor_info_1(PPRINTPROCESSOR_INFO_1 info)
return;
}
+void print_printprocessor_info_bylevel(DWORD level, LPBYTE buffer, DWORD count)
+{
+ DWORD i;
+ PPRINTPROCESSOR_INFO_1 buffer1 = NULL;
+
+ if (!buffer) {
+ return;
+ }
+
+ switch (level) {
+ case 1:
+ buffer1 = (PPRINTPROCESSOR_INFO_1)buffer;
+ break;
+ default:
+ break;
+ }
+
+ printf("Print Processor Info Level %d:\n", level);
+
+ switch (level) {
+ case 1:
+ for (i=0; i<count; i++) {
+ print_printprocessor_info_1(&buffer1[i]);
+ printf("\n");
+ }
+ break;
+ default:
+ break;
+ }
+}
+
+void print_datatypes_info_1(PDATATYPES_INFO_1 info)
+{
+ printf("\tDataTypes Name\t= %s\n", info->pName);
+
+ return;
+}
+
+void print_datatypes_info_bylevel(DWORD level, LPBYTE buffer, DWORD count)
+{
+ DWORD i;
+ PDATATYPES_INFO_1 buffer1 = NULL;
+
+ if (!buffer) {
+ return;
+ }
+
+ switch (level) {
+ case 1:
+ buffer1 = (PDATATYPES_INFO_1)buffer;
+ break;
+ default:
+ break;
+ }
+
+ printf("DataTypes Info Level %d:\n", level);
+
+ switch (level) {
+ case 1:
+ for (i=0; i<count; i++) {
+ print_datatypes_info_1(&buffer1[i]);
+ printf("\n");
+ }
+ break;
+ default:
+ break;
+ }
+}
+
void print_driver_info_1(PDRIVER_INFO_1 info)
{
printf("\tDriver Name\t= %s\n\n", info->pName);
diff --git a/testprogs/win32/spoolss/printlib_proto.h b/testprogs/win32/spoolss/printlib_proto.h
index 21f003c..688b317 100644
--- a/testprogs/win32/spoolss/printlib_proto.h
+++ b/testprogs/win32/spoolss/printlib_proto.h
@@ -1,5 +1,5 @@
-#ifndef __PRINTLIB_H__
-#define __PRINTLIB_H__
+#ifndef __PRINTLIB_PROTO_H__
+#define __PRINTLIB_PROTO_H__
#undef _PRINTF_ATTRIBUTE
#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
@@ -12,40 +12,52 @@
/* 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 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_job_info_4(PJOB_INFO_4 info);
+void print_job_info_bylevel(DWORD level, LPBYTE buffer, DWORD count);
+void print_monitor_info_1(PMONITOR_INFO_1 info);
+void print_monitor_info_2(PMONITOR_INFO_2 info);
+void print_monitor_info_bylevel(DWORD level, LPBYTE buffer, DWORD count);
+void print_port_info_1(PPORT_INFO_1 info);
+void print_port_info_2(PPORT_INFO_2 info);
+void print_port_info_3(PPORT_INFO_3 info);
+void print_port_info_bylevel(DWORD level, LPBYTE buffer, DWORD count);
+void print_form_info_1(PFORM_INFO_1 info);
+void print_form_info_2(PFORM_INFO_2 info);
+void print_form_info_bylevel(DWORD level, LPBYTE buffer, DWORD count);
+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_5 (PDRIVER_INFO_5 info);
-void print_driver_info_6 (PDRIVER_INFO_6 info);
-void print_driver_info_8 (PDRIVER_INFO_8 info);
+void print_printprocessor_info_1(PPRINTPROCESSOR_INFO_1 info);
+void print_printprocessor_info_bylevel(DWORD level, LPBYTE buffer, DWORD count);
+void print_datatypes_info_1(PDATATYPES_INFO_1 info);
+void print_datatypes_info_bylevel(DWORD level, LPBYTE buffer, DWORD count);
+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_5(PDRIVER_INFO_5 info);
+void print_driver_info_6(PDRIVER_INFO_6 info);
+void print_driver_info_8(PDRIVER_INFO_8 info);
void print_driver_info_bylevel(DWORD level, LPBYTE buffer, DWORD count);
-void print_doc_info_1 (PDOC_INFO_1 info);
-void print_printer_enum_values (PRINTER_ENUM_VALUES *info);
+void print_doc_info_1(PDOC_INFO_1 info);
void print_printer_keys(LPSTR buffer);
void print_printer_data(LPSTR keyname, LPSTR valuename, DWORD size, LPBYTE buffer, DWORD type);
+void print_printer_enum_values(PRINTER_ENUM_VALUES *info);
#undef _PRINTF_ATTRIBUTE
#define _PRINTF_ATTRIBUTE(a1, a2)
-#endif /* __PRINTLIB_H__ */
+#endif /* __PRINTLIB_PROTO_H__ */
diff --git a/testprogs/win32/spoolss/spoolss.c b/testprogs/win32/spoolss/spoolss.c
index c74fb20..0318da3 100644
--- a/testprogs/win32/spoolss/spoolss.c
+++ b/testprogs/win32/spoolss/spoolss.c
@@ -209,6 +209,10 @@ static BOOL test_GetForm(struct torture_context *tctx,
}
}
+ if (tctx->print) {
+ print_form_info_bylevel(levels[i], buffer, 1);
+ }
+
free(buffer);
buffer = NULL;
}
@@ -257,6 +261,10 @@ static BOOL test_EnumForms(struct torture_context *tctx,
}
}
+ if (tctx->print) {
+ print_form_info_bylevel(levels[i], buffer, returned);
+ }
+
free(buffer);
buffer = NULL;
}
@@ -304,6 +312,10 @@ static BOOL test_EnumPorts(struct torture_context *tctx,
}
}
+ if (tctx->print) {
+ print_port_info_bylevel(levels[i], buffer, returned);
+ }
+
free(buffer);
buffer = NULL;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list