Dmitry Timoshkov : winspool.drv/tests: Fix test failures under Windows 8.

Alexandre Julliard julliard at winehq.org
Thu Oct 31 16:12:39 CDT 2013


Module: wine
Branch: master
Commit: a521990a326423b4bcd1fff21c02d3b279013ec3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a521990a326423b4bcd1fff21c02d3b279013ec3

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Thu Oct 31 11:52:25 2013 +0900

winspool.drv/tests: Fix test failures under Windows 8.

---

 dlls/winspool.drv/tests/info.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c
index 4ab9c89..602e6e2 100644
--- a/dlls/winspool.drv/tests/info.c
+++ b/dlls/winspool.drv/tests/info.c
@@ -2916,9 +2916,19 @@ static void test_OpenPrinter_defaults(void)
     default_size = pi->pDevMode->u1.s1.dmPaperSize;
     HeapFree( GetProcessHeap(), 0, pi );
 
+    needed = 0;
+    SetLastError( 0xdeadbeef );
     ret = AddJobA( printer, 1, NULL, 0, &needed );
     ok( !ret, "got %d\n", ret );
-    add_job = HeapAlloc( GetProcessHeap(), 0, needed );
+    if (GetLastError() == ERROR_NOT_SUPPORTED) /* win8 */
+    {
+        win_skip( "AddJob is not supported on this platform\n" );
+        ClosePrinter( printer );
+        return;
+    }
+    ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError() );
+    ok( needed > sizeof(ADDJOB_INFO_1A), "AddJob needs %u bytes\n", needed);
+    add_job = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, needed );
     ret = AddJobA( printer, 1, (BYTE *)add_job, needed, &needed );
     ok( ret, "AddJobA() failed le=%d\n", GetLastError() );
 




More information about the wine-cvs mailing list