summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-03-02 17:25:35 +0100
committerGünther Deschner <gd@samba.org>2010-03-02 19:03:17 +0100
commit74703e4897028db72242d9187d726c6f0ebd1540 (patch)
treeaac38d78ae6720d633ba9e6a2660431515c6b084
parentf73c27116c60e492158c6d40823691c38a290a94 (diff)
downloadsamba-74703e4897028db72242d9187d726c6f0ebd1540.tar.gz
samba-74703e4897028db72242d9187d726c6f0ebd1540.tar.bz2
samba-74703e4897028db72242d9187d726c6f0ebd1540.zip
testprogs: make sure to do the same tests as in smbtorture in test_PrinterData().
Guenther
-rw-r--r--testprogs/win32/spoolss/printlib.c2
-rw-r--r--testprogs/win32/spoolss/printlib_proto.h1
-rw-r--r--testprogs/win32/spoolss/spoolss.c78
3 files changed, 58 insertions, 23 deletions
diff --git a/testprogs/win32/spoolss/printlib.c b/testprogs/win32/spoolss/printlib.c
index 4cab09d441..f3541c85e1 100644
--- a/testprogs/win32/spoolss/printlib.c
+++ b/testprogs/win32/spoolss/printlib.c
@@ -1142,7 +1142,7 @@ void print_printer_keys(LPSTR buffer)
}
}
-static LPSTR reg_type_str(DWORD type)
+LPSTR reg_type_str(DWORD type)
{
switch (type) {
case REG_DWORD:
diff --git a/testprogs/win32/spoolss/printlib_proto.h b/testprogs/win32/spoolss/printlib_proto.h
index 688b317078..5a439995a1 100644
--- a/testprogs/win32/spoolss/printlib_proto.h
+++ b/testprogs/win32/spoolss/printlib_proto.h
@@ -54,6 +54,7 @@ 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_keys(LPSTR buffer);
+LPSTR reg_type_str(DWORD type);
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
diff --git a/testprogs/win32/spoolss/spoolss.c b/testprogs/win32/spoolss/spoolss.c
index 49bcc59853..97bf5eb1fc 100644
--- a/testprogs/win32/spoolss/spoolss.c
+++ b/testprogs/win32/spoolss/spoolss.c
@@ -1375,35 +1375,69 @@ static BOOL test_PrinterData(struct torture_context *tctx,
LPSTR printername,
HANDLE handle)
{
+ char tmp[1024];
LPSTR keyname = "torture_key";
LPSTR valuename = "torture_value";
BOOL ret = TRUE;
- DWORD type, type_ex;
- LPBYTE buffer, buffer_ex;
- DWORD size, size_ex;
+ DWORD types[] = {
+ REG_SZ,
+ REG_DWORD,
+ REG_BINARY
+ };
+ DWORD value = 12345678;
+ LPSTR str = "abcdefghijklmnopqrstuvwxzy";
+ DWORD t, s;
- torture_comment(tctx, "Testing PrinterData");
+ for (t=0; t < ARRAY_SIZE(types); t++) {
+ for (s=0; s < strlen(str); s++) {
- type = REG_SZ;
- size = 4;
- buffer = malloc(size);
- if (!buffer) {
- return FALSE;
+ DWORD type, type_ex;
+ LPBYTE buffer, buffer_ex;
+ DWORD size, size_ex;
+
+ if (types[t] == REG_DWORD) {
+ s = 0xffff;
+ }
+
+ switch (types[t]) {
+ case REG_BINARY:
+ buffer = malloc(s);
+ memcpy(buffer, str, s);
+ size = s;
+ break;
+ case REG_DWORD:
+ buffer = malloc(4);
+ size = 4;
+ break;
+ case REG_SZ:
+ buffer = malloc(s);
+ memcpy(buffer, str, s);
+ size = s;
+ break;
+ default:
+ sprintf(tmp, "type %d untested\n", types[t]);
+ torture_fail(tctx, tmp);
+ break;
+ }
+
+ type = types[t];
+
+ torture_comment(tctx, "Testing PrinterData (type: %s, size: 0x%08x)", reg_type_str(type), size);
+
+ ret &= test_SetPrinterDataEx(tctx, printername, keyname, valuename, handle, type, buffer, size);
+ ret &= test_GetPrinterDataEx(tctx, printername, keyname, valuename, handle, &type_ex, &buffer_ex, &size_ex);
+ if (ret == TRUE) {
+ if (!PrinterDataEqual(tctx, type_ex, type, size_ex, size, buffer_ex, buffer)) {
+ torture_warning(tctx, "GetPrinterDataEx does not return the same info as we set with SetPrinterDataEx");
+ ret = FALSE;
+ }
+ }
+ ret &= test_DeletePrinterDataEx(tctx, printername, keyname, valuename, handle);
+ ret &= test_DeletePrinterKey(tctx, printername, keyname, handle);
+
+ free(buffer);
}
- buffer[0] = 'c';
- buffer[1] = 'r';
- buffer[2] = 'a';
- buffer[3] = 'p';
-
- ret &= test_SetPrinterDataEx(tctx, printername, keyname, valuename, handle, type, buffer, size);
- ret &= test_GetPrinterDataEx(tctx, printername, keyname, valuename, handle, &type_ex, &buffer_ex, &size_ex);
- if (ret == TRUE) {
- ret &= PrinterDataEqual(tctx, type_ex, type, size_ex, size, buffer_ex, buffer);
}
- ret &= test_DeletePrinterDataEx(tctx, printername, keyname, valuename, handle);
- ret &= test_DeletePrinterKey(tctx, printername, keyname, handle);
-
- free(buffer);
return TRUE;
}