winspool.drv: Use nameless unions/structs.

dlls/winspool.drv/info.c

@@ -30,9 +30,6 @@
 #include <ctype.h>
 #include <stddef.h>
 
-#define NONAMELESSSTRUCT
-#define NONAMELESSUNION
-
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
 #include "windef.h"
@@ -1898,17 +1895,17 @@ BOOL WINAPI IsValidDevmodeW(PDEVMODEW dm, SIZE_T size)
     } map[] =
     {
 #define F_SIZE(field) FIELD_OFFSET(DEVMODEW, field) + sizeof(dm->field)
-        { DM_ORIENTATION, F_SIZE(u1.s1.dmOrientation) },
-        { DM_PAPERSIZE, F_SIZE(u1.s1.dmPaperSize) },
-        { DM_PAPERLENGTH, F_SIZE(u1.s1.dmPaperLength) },
-        { DM_PAPERWIDTH, F_SIZE(u1.s1.dmPaperWidth) },
-        { DM_SCALE, F_SIZE(u1.s1.dmScale) },
-        { DM_COPIES, F_SIZE(u1.s1.dmCopies) },
-        { DM_DEFAULTSOURCE, F_SIZE(u1.s1.dmDefaultSource) },
-        { DM_PRINTQUALITY, F_SIZE(u1.s1.dmPrintQuality) },
-        { DM_POSITION, F_SIZE(u1.s2.dmPosition) },
-        { DM_DISPLAYORIENTATION, F_SIZE(u1.s2.dmDisplayOrientation) },
-        { DM_DISPLAYFIXEDOUTPUT, F_SIZE(u1.s2.dmDisplayFixedOutput) },
+        { DM_ORIENTATION, F_SIZE(dmOrientation) },
+        { DM_PAPERSIZE, F_SIZE(dmPaperSize) },
+        { DM_PAPERLENGTH, F_SIZE(dmPaperLength) },
+        { DM_PAPERWIDTH, F_SIZE(dmPaperWidth) },
+        { DM_SCALE, F_SIZE(dmScale) },
+        { DM_COPIES, F_SIZE(dmCopies) },
+        { DM_DEFAULTSOURCE, F_SIZE(dmDefaultSource) },
+        { DM_PRINTQUALITY, F_SIZE(dmPrintQuality) },
+        { DM_POSITION, F_SIZE(dmPosition) },
+        { DM_DISPLAYORIENTATION, F_SIZE(dmDisplayOrientation) },
+        { DM_DISPLAYFIXEDOUTPUT, F_SIZE(dmDisplayFixedOutput) },
         { DM_COLOR, F_SIZE(dmColor) },
         { DM_DUPLEX, F_SIZE(dmDuplex) },
         { DM_YRESOLUTION, F_SIZE(dmYResolution) },
@@ -1919,8 +1916,8 @@ BOOL WINAPI IsValidDevmodeW(PDEVMODEW dm, SIZE_T size)
         { DM_BITSPERPEL, F_SIZE(dmBitsPerPel) },
         { DM_PELSWIDTH, F_SIZE(dmPelsWidth) },
         { DM_PELSHEIGHT, F_SIZE(dmPelsHeight) },
-        { DM_DISPLAYFLAGS, F_SIZE(u2.dmDisplayFlags) },
-        { DM_NUP, F_SIZE(u2.dmNup) },
+        { DM_DISPLAYFLAGS, F_SIZE(dmDisplayFlags) },
+        { DM_NUP, F_SIZE(dmNup) },
         { DM_DISPLAYFREQUENCY, F_SIZE(dmDisplayFrequency) },
         { DM_ICMMETHOD, F_SIZE(dmICMMethod) },
         { DM_ICMINTENT, F_SIZE(dmICMIntent) },