spoolss: make all security descriptors and devicemodes 4 byte aligned and add missing...

Guenther
(cherry picked from commit 8f52957369bf8ce7591d5d9a1436ccb7e384c612)
(cherry picked from commit ef3bd911cae625b524fa79dc28e67db1234f1eeb)

diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index 503c77ebce699da2c8e4a7c736e4138f6b6377e4..da890774e74fc5025675595972b15020029789ec 100644 (file)
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -473,12 +473,12 @@ import "misc.idl", "security.idl", "winreg.idl";
                [relative] nstring *drivername;
                [relative] nstring *comment;
                [relative] nstring *location;
-               [relative,subcontext(0)] spoolss_DeviceMode *devmode;
+               [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_DeviceMode *devmode;
                [relative] nstring *sepfile;
                [relative] nstring *printprocessor;
                [relative] nstring *datatype;
                [relative] nstring *parameters;
-               [relative,subcontext(0)] security_descriptor *secdesc;
+               [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc;
                spoolss_PrinterAttributes attributes;
                [range(0,99)] uint32 priority;
                uint32 defaultpriority;
@@ -490,7 +490,7 @@ import "misc.idl", "security.idl", "winreg.idl";
        } spoolss_PrinterInfo2;
 
        typedef [public,gensize] struct {
-               [relative,subcontext(0)] security_descriptor *secdesc;
+               [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc;
        } spoolss_PrinterInfo3;
 
        typedef [public,gensize] struct {
@@ -525,7 +525,7 @@ import "misc.idl", "security.idl", "winreg.idl";
        } spoolss_PrinterInfo7;
 
        typedef struct {
-               [relative,subcontext(0)] spoolss_DeviceMode *devmode;
+               [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_DeviceMode *devmode;
        } spoolss_DeviceModeInfo;
 
        typedef [nodiscriminant,relative_base,public,gensize,flag(NDR_RELATIVE_REVERSE)] union {
@@ -619,9 +619,9 @@ import "misc.idl", "security.idl", "winreg.idl";
                [relative] nstring *print_processor;
                [relative] nstring *parameters;
                [relative] nstring *driver_name;
-               [relative] spoolss_DeviceMode *devmode;
+               [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_DeviceMode *devmode;
                [relative] nstring *text_status;
-               [relative] security_descriptor *secdesc;
+               [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc;
                spoolss_JobStatus status;
                [range(0,99)] uint32 priority;
                uint32 position;
@@ -651,9 +651,9 @@ import "misc.idl", "security.idl", "winreg.idl";
                [relative] nstring *print_processor;
                [relative] nstring *parameters;
                [relative] nstring *driver_name;
-               [relative] spoolss_DeviceMode *devmode;
+               [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_DeviceMode *devmode;
                [relative] nstring *text_status;
-               [relative] security_descriptor *secdesc;
+               [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc;
                spoolss_JobStatus status;
                [range(0,99)] uint32 priority;
                uint32 position;