Ignore:
Timestamp:
Jul 2, 2011, 3:35:33 PM (14 years ago)
Author:
Herwig Bauernfeind
Message:

Samba 3.5: Update trunk to 3.5.8

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/server/librpc/gen_ndr/spoolss.h

    r429 r596  
    127127        uint16_t second;
    128128        uint16_t millisecond;
    129 }/* [gensize] */;
     129}/* [noprint,gensize] */;
    130130
    131131struct spoolss_TimeCtr {
    … …  
    245245
    246246struct spoolss_PrinterInfo0 {
    247         const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    248         const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     247        const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     248        const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    249249        uint32_t cjobs;
    250250        uint32_t total_jobs;
    … …  
    805805struct spoolss_PrinterInfo1 {
    806806        uint32_t flags;
    807         const char * description;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    808         const char * name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    809         const char * comment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     807        const char * description;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     808        const char * name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     809        const char * comment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    810810}/* [gensize,public] */;
    811811
    812812struct spoolss_PrinterInfo2 {
    813         const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    814         const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    815         const char * sharename;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    816         const char * portname;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    817         const char * drivername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    818         const char * comment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    819         const char * location;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     813        const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     814        const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     815        const char * sharename;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     816        const char * portname;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     817        const char * drivername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     818        const char * comment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     819        const char * location;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    820820        struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */
    821         const char * sepfile;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    822         const char * printprocessor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    823         const char * datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    824         const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     821        const char * sepfile;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     822        const char * printprocessor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     823        const char * datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     824        const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    825825        struct spoolss_security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */
    826826        uint32_t attributes;
    … …  
    839839
    840840struct spoolss_PrinterInfo4 {
    841         const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    842         const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     841        const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     842        const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    843843        uint32_t attributes;
    844844}/* [gensize,public] */;
    845845
    846846struct spoolss_PrinterInfo5 {
    847         const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    848         const char * portname;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     847        const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     848        const char * portname;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    849849        uint32_t attributes;
    850850        uint32_t device_not_selected_timeout;
    … …  
    864864
    865865struct spoolss_PrinterInfo7 {
    866         const char * guid;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     866        const char * guid;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    867867        uint32_t action;
    868868}/* [gensize,public] */;
    … …  
    892892struct spoolss_JobInfo1 {
    893893        uint32_t job_id;
    894         const char * printer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    895         const char * server_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    896         const char * user_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    897         const char * document_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    898         const char * data_type;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    899         const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     894        const char * printer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     895        const char * server_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     896        const char * user_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     897        const char * document_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     898        const char * data_type;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     899        const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    900900        uint32_t status;
    901901        uint32_t priority;/* [range(0,99)] */
    … …  
    908908struct spoolss_JobInfo2 {
    909909        uint32_t job_id;
    910         const char * printer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    911         const char * server_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    912         const char * user_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    913         const char * document_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    914         const char * notify_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    915         const char * data_type;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    916         const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    917         const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    918         const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     910        const char * printer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     911        const char * server_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     912        const char * user_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     913        const char * document_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     914        const char * notify_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     915        const char * data_type;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     916        const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     917        const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     918        const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    919919        struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */
    920         const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     920        const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    921921        struct spoolss_security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */
    922922        uint32_t status;
    … …  
    940940struct spoolss_JobInfo4 {
    941941        uint32_t job_id;
    942         const char * printer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    943         const char * server_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    944         const char * user_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    945         const char * document_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    946         const char * notify_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    947         const char * data_type;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    948         const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    949         const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    950         const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     942        const char * printer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     943        const char * server_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     944        const char * user_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     945        const char * document_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     946        const char * notify_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     947        const char * data_type;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     948        const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     949        const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     950        const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    951951        struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */
    952         const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     952        const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    953953        struct spoolss_security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */
    954954        uint32_t status;
    … …  
    12171217struct spoolss_StringArray {
    12181218        uint32_t _ndr_size;/* [value((ndr_size_spoolss_StringArray(r,ndr->iconv_convenience,ndr->flags)-4)/2)] */
    1219         const char ** string;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1219        const char ** string;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    12201220}/* [public] */;
    12211221
    … …  
    13641364
    13651365struct spoolss_DriverInfo1 {
    1366         const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1366        const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    13671367}/* [gensize,public] */;
    13681368
    13691369struct spoolss_DriverInfo2 {
    13701370        enum spoolss_DriverOSVersion version;
    1371         const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1372         const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1373         const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1374         const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1375         const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1371        const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1372        const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1373        const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1374        const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1375        const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    13761376}/* [gensize,public] */;
    13771377
    13781378struct spoolss_DriverInfo3 {
    13791379        enum spoolss_DriverOSVersion version;
    1380         const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1381         const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1382         const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1383         const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1384         const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1385         const char * help_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1386         const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1387         const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1388         const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1380        const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1381        const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1382        const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1383        const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1384        const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1385        const char * help_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1386        const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1387        const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1388        const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    13891389}/* [gensize,public] */;
    13901390
    13911391struct spoolss_DriverInfo4 {
    13921392        enum spoolss_DriverOSVersion version;
    1393         const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1394         const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1395         const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1396         const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1397         const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1398         const char * help_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1399         const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1400         const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1401         const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1402         const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1393        const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1394        const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1395        const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1396        const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1397        const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1398        const char * help_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1399        const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1400        const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1401        const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1402        const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    14031403}/* [gensize,public] */;
    14041404
    14051405struct spoolss_DriverInfo5 {
    14061406        enum spoolss_DriverOSVersion version;
    1407         const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1408         const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1409         const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1410         const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1411         const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1407        const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1408        const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1409        const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1410        const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1411        const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    14121412        uint32_t driver_attributes;
    14131413        uint32_t config_version;
    … …  
    14171417struct spoolss_DriverInfo6 {
    14181418        enum spoolss_DriverOSVersion version;
    1419         const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1420         const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1421         const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1422         const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1423         const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1424         const char * help_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1425         const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1426         const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1427         const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1428         const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1419        const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1420        const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1421        const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1422        const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1423        const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1424        const char * help_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1425        const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1426        const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1427        const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1428        const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    14291429        NTTIME driver_date;
    14301430        uint64_t driver_version;
    1431         const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1432         const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1433         const char * hardware_id;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1434         const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1431        const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1432        const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1433        const char * hardware_id;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1434        const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    14351435}/* [gensize,public] */;
    14361436
    … …  
    14381438        uint32_t size;
    14391439        enum spoolss_DriverOSVersion version;
    1440         const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1441         const char * inf_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1442         const char * install_source_root;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1440        const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1441        const char * inf_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1442        const char * install_source_root;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    14431443}/* [gensize,public] */;
    14441444
    14451445struct spoolss_DriverInfo8 {
    14461446        enum spoolss_DriverOSVersion version;
    1447         const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1448         const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1449         const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1450         const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1451         const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1452         const char * help_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1453         const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1454         const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1455         const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1456         const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1447        const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1448        const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1449        const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1450        const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1451        const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1452        const char * help_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1453        const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1454        const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1455        const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1456        const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    14571457        NTTIME driver_date;
    14581458        uint64_t driver_version;
    1459         const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1460         const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1461         const char * hardware_id;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1462         const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1463         const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1464         const char * vendor_setup;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1465         const char ** color_profiles;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1466         const char * inf_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1459        const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1460        const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1461        const char * hardware_id;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1462        const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1463        const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1464        const char * vendor_setup;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1465        const char ** color_profiles;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1466        const char * inf_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    14671467        uint32_t printer_driver_attributes;
    1468         const char ** core_driver_dependencies;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1468        const char ** core_driver_dependencies;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    14691469        NTTIME min_inbox_driver_ver_date;
    14701470        uint64_t min_inbox_driver_ver_version;
    … …  
    14911491
    14921492struct spoolss_DriverFileInfo {
    1493         const char * file_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1493        const char * file_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    14941494        enum spoolss_DriverFileType file_type;
    14951495        uint32_t file_version;
    … …  
    14981498struct spoolss_DriverInfo101 {
    14991499        enum spoolss_DriverOSVersion version;
    1500         const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1501         const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1502         struct spoolss_DriverFileInfo *file_info;/* [relative,size_is(file_count)] */
     1500        const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1501        const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1502        struct spoolss_DriverFileInfo *file_info;/* [relative,flag(LIBNDR_FLAG_ALIGN4),size_is(file_count)] */
    15031503        uint32_t file_count;
    1504         const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1505         const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1506         const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1504        const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1505        const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1506        const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    15071507        NTTIME driver_date;
    15081508        uint64_t driver_version;
    1509         const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1510         const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1511         const char * hardware_id;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1512         const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1509        const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1510        const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1511        const char * hardware_id;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1512        const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    15131513}/* [gensize,nopush,public,nopull] */;
    15141514
    … …  
    15261526
    15271527struct spoolss_DriverDirectoryInfo1 {
    1528         const char * directory_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1528        const char * directory_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    15291529}/* [gensize,public] */;
    15301530
    … …  
    15341534
    15351535struct spoolss_PrintProcessorInfo1 {
    1536         const char * print_processor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1536        const char * print_processor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    15371537}/* [gensize,public] */;
    15381538
    … …  
    15421542
    15431543struct spoolss_PrintProcessorDirectoryInfo1 {
    1544         const char * directory_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1544        const char * directory_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    15451545}/* [gensize,public] */;
    15461546
    … …  
    15651565        uint32_t build;
    15661566        uint32_t platform_id;/* [value(2)] */
    1567         const char * extra_string;/* [subcontext_size(256),subcontext(0),flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1567        const char * extra_string;/* [subcontext_size(256),subcontext(0),flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    15681568}/* [gensize,public] */;
    15691569
    … …  
    15741574        uint32_t build;
    15751575        uint32_t platform_id;/* [value(2)] */
    1576         const char * extra_string;/* [subcontext_size(256),subcontext(0),flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1576        const char * extra_string;/* [subcontext_size(256),subcontext(0),flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    15771577        uint16_t service_pack_major;
    15781578        uint16_t service_pack_minor;
    … …  
    15831583
    15841584union spoolss_PrinterData {
    1585         const char * string;/* [flag(LIBNDR_FLAG_STR_NULLTERM),case(REG_SZ)] */
     1585        const char * string;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2),case(REG_SZ)] */
    15861586        DATA_BLOB binary;/* [flag(LIBNDR_FLAG_REMAINING),case(REG_BINARY)] */
    15871587        uint32_t value;/* [case(REG_DWORD)] */
    1588         const char ** string_array;/* [flag(LIBNDR_FLAG_STR_NULLTERM),case(REG_MULTI_SZ)] */
     1588        const char ** string_array;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2),case(REG_MULTI_SZ)] */
    15891589        DATA_BLOB data;/* [flag(LIBNDR_FLAG_REMAINING),default] */
    15901590}/* [nodiscriminant,public] */;
    … …  
    16191619struct spoolss_FormInfo1 {
    16201620        enum spoolss_FormFlags flags;
    1621         const char * form_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1621        const char * form_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    16221622        struct spoolss_FormSize size;
    16231623        struct spoolss_FormArea area;
    … …  
    16311631struct spoolss_FormInfo2 {
    16321632        enum spoolss_FormFlags flags;
    1633         const char * form_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1633        const char * form_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    16341634        struct spoolss_FormSize size;
    16351635        struct spoolss_FormArea area;
    16361636        const char * keyword;/* [relative,flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
    16371637        uint32_t string_type;
    1638         const char * mui_dll;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1638        const char * mui_dll;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    16391639        uint32_t ressource_id;
    1640         const char * display_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1640        const char * display_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    16411641        uint16_t lang_id;
    16421642        uint16_t unused;
    … …  
    16741674
    16751675struct spoolss_PortInfo1 {
    1676         const char * port_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1676        const char * port_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    16771677}/* [gensize,public] */;
    16781678
    … …  
    16841684
    16851685struct spoolss_PortInfo2 {
    1686         const char * port_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1687         const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1688         const char * description;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1686        const char * port_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1687        const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1688        const char * description;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    16891689        uint32_t port_type;
    16901690        uint32_t reserved;
    … …  
    17431743struct spoolss_PortInfo3 {
    17441744        enum spoolss_PortStatus status;
    1745         const char * status_string;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1745        const char * status_string;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    17461746        enum spoolss_PortSeverity severity;
    17471747}/* [gensize,public] */;
    17481748
    17491749struct spoolss_PortInfoFF {
    1750         const char * port_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1750        const char * port_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    17511751        DATA_BLOB monitor_data;
    17521752}/* [gensize,public] */;
    … …  
    17601760
    17611761struct spoolss_MonitorInfo1 {
    1762         const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1762        const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    17631763}/* [gensize,public] */;
    17641764
    17651765struct spoolss_MonitorInfo2 {
    1766         const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1767         const char * environment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
    1768         const char * dll_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1766        const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1767        const char * environment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
     1768        const char * dll_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    17691769}/* [gensize,public] */;
    17701770
    … …  
    17751775
    17761776struct spoolss_PrintProcDataTypesInfo1 {
    1777         const char * name_array;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     1777        const char * name_array;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    17781778}/* [gensize,public] */;
    17791779
    … …  
    20662066
    20672067struct spoolss_PrinterEnumValues {
    2068         const char * value_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     2068        const char * value_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    20692069        uint32_t value_name_len;/* [value(2*strlen_m_term(value_name))] */
    20702070        enum winreg_Type type;
    2071         DATA_BLOB *data;/* [relative,subcontext_size(data_length),subcontext(0),flag(LIBNDR_FLAG_REMAINING)] */
    2072         uint32_t data_length;/* [value(data->length)] */
     2071        DATA_BLOB *data;/* [relative,subcontext_size(data_length),subcontext(0),flag(LIBNDR_FLAG_REMAINING|ndr_spoolss_PrinterEnumValues_align(r->type))] */
     2072        uint32_t data_length;/* [value(data?data->length:0)] */
    20732073}/* [relative_base,gensize,public] */;
    20742074
    20752075union spoolss_KeyNames {
    2076         const char ** string_array;/* [default,flag(LIBNDR_FLAG_STR_NULLTERM)] */
     2076        const char ** string_array;/* [default,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    20772077}/* [nodiscriminant] */;
    20782078
    … …  
    21312131
    21322132struct spoolss_MonitorUi {
    2133         const char * dll_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
     2133        const char * dll_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */
    21342134}/* [public] */;
    21352135
Note: See TracChangeset for help on using the changeset viewer.