Merge r67713 and r67936 (Eric's parport driver) from trunk

[reactos.git] / rostests / apitests / winspool / EnumPrintProcessorDatatypes.c

diff --git a/rostests/apitests/winspool/EnumPrintProcessorDatatypes.c b/rostests/apitests/winspool/EnumPrintProcessorDatatypes.c
index f2005c7..4259ea5 100644 (file)
--- a/rostests/apitests/winspool/EnumPrintProcessorDatatypes.c
+++ b/rostests/apitests/winspool/EnumPrintProcessorDatatypes.c
@@ -48,6 +48,13 @@ START_TEST(EnumPrintProcessorDatatypes)
     ok(cbNeeded > 0, "cbNeeded is 0!\n");
     ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned);
 
     ok(cbNeeded > 0, "cbNeeded is 0!\n");
     ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned);
 

+    // Same error has to occur with a size to small.
+    SetLastError(0xDEADBEEF);
+    ok(!EnumPrintProcessorDatatypesW(NULL, L"wInPrInT", 1, NULL, 1, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n");
+    ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu!\n", GetLastError());
+    ok(cbNeeded > 0, "cbNeeded is 0!\n");
+    ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned);
+

     // Now provide the demanded size, but no buffer.
     SetLastError(0xDEADBEEF);
     ok(!EnumPrintProcessorDatatypesW(NULL, L"wInPrInT", 1, NULL, cbNeeded, &cbTemp, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n");
     // Now provide the demanded size, but no buffer.
     SetLastError(0xDEADBEEF);
     ok(!EnumPrintProcessorDatatypesW(NULL, L"wInPrInT", 1, NULL, cbNeeded, &cbTemp, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n");


@@ -62,13 +69,6 @@ START_TEST(EnumPrintProcessorDatatypes)
     ok(cbTemp == 0, "cbTemp is %lu!\n", cbTemp);
     ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned);
 
     ok(cbTemp == 0, "cbTemp is %lu!\n", cbTemp);
     ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned);
 

-    // Same error has to occur with a valid Print Processor, but a size too small.
-    SetLastError(0xDEADBEEF);
-    ok(!EnumPrintProcessorDatatypesW(NULL, L"wInPrInT", 1, NULL, cbNeeded, &cbTemp, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n");
-    ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError());
-    ok(cbTemp == 0, "cbTemp is %lu!\n", cbTemp);
-    ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned);
-

     // Finally use the function as intended and aim for success!
     pDatatypesInfo1 = HeapAlloc(GetProcessHeap(), 0, cbNeeded);
     SetLastError(0xDEADBEEF);
     // Finally use the function as intended and aim for success!
     pDatatypesInfo1 = HeapAlloc(GetProcessHeap(), 0, cbNeeded);
     SetLastError(0xDEADBEEF);