wineps: Use default devmode if winspool returns fake data.

Fixes regression caused by aa3699dd.

wineps: Use default devmode if winspool returns fake data.
9f578f6a · Piotr Caban · Alexandre Julliard · 407b01c4 · 9f578f6a
Commit 9f578f6a authored May 16, 2023 by Piotr Caban Committed by Alexandre Julliard May 17, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

init.c dlls/wineps.drv/init.c +4 -2

No files found.
--- a/dlls/wineps.drv/init.c
+++ b/dlls/wineps.drv/init.c
@@ -644,14 +644,16 @@ static PSDRV_DEVMODE *get_devmode( HANDLE printer, const WCHAR *name, BOOL *is_d

    *is_default = FALSE;

-    if (dm)
+    if (dm && (dm->dmPublic.dmFields & DefaultDevmode.dmPublic.dmFields) ==
+            DefaultDevmode.dmPublic.dmFields)
    {
        TRACE( "Retrieved devmode from winspool\n" );
        return dm;
    }

    TRACE( "Using default devmode\n" );
-    dm = HeapAlloc( PSDRV_Heap, 0, size );
+    if (!dm)
+        dm = HeapAlloc( PSDRV_Heap, 0, size );
    if (dm)
    {
        memcpy( dm, &DefaultDevmode, min(sizeof(DefaultDevmode), size) );