summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2000-06-04 02:29:00 +0000
committerAndrew Tridgell <tridge@samba.org>2000-06-04 02:29:00 +0000
commitad267718ddaec0b1fc1588f180f11500c7f31d69 (patch)
treec7969b484e392ba401110d9a79346c7b09b73810 /source3/include
parentdbf004bdabd08272e5dfb07a5511091746b6631a (diff)
downloadsamba-ad267718ddaec0b1fc1588f180f11500c7f31d69.tar.gz
samba-ad267718ddaec0b1fc1588f180f11500c7f31d69.tar.bz2
samba-ad267718ddaec0b1fc1588f180f11500c7f31d69.zip
fixed the pack/unpack of the devicemode
we were being bitten by uint16/uint32 mixups (This used to be commit 1d37f76953534f7bf9d8890dda30c7e00cbb024c)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/nt_printing.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index 3aad3beff9..9282367885 100644
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -186,11 +186,12 @@ typedef struct nt_printer_param
typedef struct ntdevicemode
{
fstring devicename;
+ fstring formname;
+
uint16 specversion;
uint16 driverversion;
uint16 size;
uint16 driverextra;
- uint32 fields;
uint16 orientation;
uint16 papersize;
uint16 paperlength;
@@ -204,8 +205,9 @@ typedef struct ntdevicemode
uint16 yresolution;
uint16 ttoption;
uint16 collate;
- fstring formname;
uint16 logpixels;
+
+ uint32 fields;
uint32 bitsperpel;
uint32 pelswidth;
uint32 pelsheight;