[PATCH v7 2/2] winspool: Check the alignment of dmSize in IsValidDevmodeW()

[Piotr Caban]

From: Piotr Caban

---
 dlls/winspool.drv/info.c       | 2 +-
 dlls/winspool.drv/tests/info.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index 8a85dc97c73..86b37d7743e 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -1935,7 +1935,7 @@ BOOL WINAPI IsValidDevmodeW(PDEVMODEW dm, SIZE_T size)
     if (((dm->dmSize - offFields) % 4) && dm->dmDriverExtra) return FALSE;

for (i = 0; i < ARRAY_SIZE(map); i++)
-        if ((dm->dmFields & map[i].flag) && size < map[i].size)
+        if ((dm->dmFields & map[i].flag) && dm->dmSize < map[i].size)
             return FALSE;

return TRUE;
diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c
index e8beceeb571..3423bc3c03f 100644
--- a/dlls/winspool.drv/tests/info.c
+++ b/dlls/winspool.drv/tests/info.c
@@ -3088,6 +3088,8 @@ static void test_IsValidDevmodeW(void)
         dm.dmFields = test[i].dmFields;
         ret = IsValidDevmodeW(&dm, dm.dmSize);
         ok(ret == test[i].ret, "%d: got %d\n", i, ret);
+        ret = IsValidDevmodeW(&dm, dm.dmSize + 4);
+        ok(ret == test[i].ret, "%d: got %d\n", i, ret);
     }

dm.dmFields = 0;