diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 0070cb81c..f892762f2 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-29  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+	* include/winspool.h (JOB_INFO_3): Add structure.
+	(PROVIDOR_INFO_*{AW}): Add structure.
+	* include/winspool.h [_WIN32_WINNT >= 0x0500]
+	(PRINTER_ENUM_VALUES{AW}): Add structure.
+	(PRINTPROCESSOR_CAPS): Add structure.
+
 2006-03-29  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 	* include/winspool.h [_WIN32_WINNT >= 0x0500]
 	(PRINTER_INFO_7A): Correct definition.
diff --git a/winsup/w32api/include/winspool.h b/winsup/w32api/include/winspool.h
index e9fe235bc..2492d61da 100644
--- a/winsup/w32api/include/winspool.h
+++ b/winsup/w32api/include/winspool.h
@@ -324,6 +324,11 @@ typedef struct _JOB_INFO_2W {
 	DWORD Time;
 	DWORD PagesPrinted;
 } JOB_INFO_2W,*PJOB_INFO_2W,*LPJOB_INFO_2W;
+typedef struct _JOB_INFO_3 { 
+	DWORD JobId; 
+	DWORD NextJobId; 
+	DWORD Reserved; 
+} JOB_INFO_3,*PJOB_INFO_3,*LPJOB_INFO_3; 
 typedef struct _DOC_INFO_1A {
 	LPSTR pDocName;
 	LPSTR pOutputFile;
@@ -516,6 +521,22 @@ typedef struct _PORT_INFO_3W {
 	LPWSTR pszStatus;
 	DWORD dwSeverity;
 } PORT_INFO_3W,*PPORT_INFO_3W,*LPPORT_INFO_3W;
+#if (_WIN32_WINNT >= 0x0500)
+typedef struct _PRINTER_ENUM_VALUESA {
+	LPSTR pValueName;
+	DWORD cbValueName;
+	DWORD dwType;
+	LPBYTE pData;
+	DWORD cbData;
+} PRINTER_ENUM_VALUESA,*PPRINTER_ENUM_VALUESA,*LPRINTER_ENUM_VALUESA;
+typedef struct _PRINTER_ENUM_VALUESW {
+	LPWSTR pValueName;
+	DWORD cbValueName;
+	DWORD dwType;
+	LPBYTE pData;
+	DWORD cbData;
+} PRINTER_ENUM_VALUESW,*PPRINTER_ENUM_VALUESW,*LPRINTER_ENUM_VALUESW;
+#endif
 typedef	struct _PRINTER_INFO_1A {
 	DWORD Flags;
 	LPSTR pDescription;
@@ -663,6 +684,30 @@ typedef	struct _PRINTER_DEFAULTSW {
 	LPDEVMODE pDevMode;
 	ACCESS_MASK DesiredAccess;
 } PRINTER_DEFAULTSW,*PPRINTER_DEFAULTSW,*LPPRINTER_DEFAULTSW;
+#if (_WIN32_WINNT >= 0x0500)
+typedef	struct _PRINTPROCESSOR_CAPS_1 {
+	DWORD dwLevel;
+	DWORD dwNupOptions;
+	DWORD dwPageOrderFlags;
+	DWORD dwNumberOfCopies;
+} PRINTPROCESSOR_CAPS_1,*PPRINTPROCESSOR_CAPS_1,*LPPRINTPROCESSOR_CAPS_1;
+#endif
+typedef	struct _PROVIDOR_INFO_1A { 
+	LPSTR pName;
+	LPSTR pEnvironment;
+	LPSTR pDLLName;
+} PROVIDOR_INFO_1A,*PPROVIDOR_INFO_1A,*LPPROVIDOR_INFO_1A;
+typedef	struct _PROVIDOR_INFO_1W { 
+	LPWSTR pName;
+	LPWSTR pEnvironment;
+	LPWSTR pDLLName;
+} PROVIDOR_INFO_1W,*PPROVIDOR_INFO_1W,*LPPROVIDOR_INFO_1W;
+typedef	struct _PROVIDOR_INFO_2A {
+	LPSTR pOrder;
+} PROVIDOR_INFO_2A,*PPROVIDOR_INFO_2A,*LPROVIDOR_INFO_2A;
+typedef	struct _PROVIDOR_INFO_2W {
+	LPWSTR pOrder;
+} PROVIDOR_INFO_2W,*PPROVIDOR_INFO_2W,*LPROVIDOR_INFO_2W;
 
 BOOL WINAPI AbortPrinter(HANDLE);
 BOOL WINAPI AddFormA(HANDLE,DWORD,PBYTE);
@@ -793,6 +838,7 @@ typedef DRIVER_INFO_4W DRIVER_INFO_4,*PDRIVER_INFO_4,*LPDRIVER_INFO_4;
 typedef DRIVER_INFO_5W DRIVER_INFO_5,*PDRIVER_INFO_5,*LPDRIVER_INFO_5;
 typedef DRIVER_INFO_6W DRIVER_INFO_6,*PDRIVER_INFO_6,*LPDRIVER_INFO_6;
 #endif
+typedef PRINTER_ENUM_VALUESW PRINTER_ENUM_VALUES,*PPRINTER_ENUM_VALUES,*LPRINTER_ENUM_VALUES;
 typedef PRINTER_INFO_1W PRINTER_INFO_1,*PPRINTER_INFO_1,*LPPRINTER_INFO_1;
 typedef PRINTER_INFO_2W PRINTER_INFO_2,*PPRINTER_INFO_2,*LPPRINTER_INFO_2;
 typedef PRINTER_INFO_4W PRINTER_INFO_4,*PPRINTER_INFO_4,*LPPRINTER_INFO_4;
@@ -803,6 +849,8 @@ typedef PRINTER_INFO_7W PRINTER_INFO_7,*PPRINTER_INFO_7,*LPPRINTER_INFO_7;
 typedef PRINTPROCESSOR_INFO_1W PRINTPROCESSOR_INFO_1,*PPRINTPROCESSOR_INFO_1,*LPPRINTPROCESSOR_INFO_1;
 typedef FORM_INFO_1W FORM_INFO_1,*PFORM_INFO_1,*LPFORM_INFO_1;
 typedef PRINTER_DEFAULTSW PRINTER_DEFAULTS,*PPRINTER_DEFAULTS,*LPPRINTER_DEFAULTS;
+typedef PROVIDOR_INFO_1W PROVIDOR_INFO_1,*PPROVIDOR_INFO_1,*LPROVIDOR_INFO_1;
+typedef PROVIDOR_INFO_2W PROVIDOR_INFO_2,*PPROVIDOR_INFO_2,*LPROVIDOR_INFO_2;
 #define AddForm AddFormW
 #define AddJob AddJobW
 #define AddMonitor AddMonitorW
@@ -867,6 +915,7 @@ typedef DRIVER_INFO_3A DRIVER_INFO_3,*PDRIVER_INFO_3,*LPDRIVER_INFO_3;
 typedef DRIVER_INFO_4A DRIVER_INFO_4,*PDRIVER_INFO_4,*LPDRIVER_INFO_4;
 typedef DRIVER_INFO_5A DRIVER_INFO_5,*PDRIVER_INFO_5,*LPDRIVER_INFO_5;
 typedef DRIVER_INFO_6A DRIVER_INFO_6,*PDRIVER_INFO_6,*LPDRIVER_INFO_6;
+typedef PRINTER_ENUM_VALUESA PRINTER_ENUM_VALUES,*PPRINTER_ENUM_VALUES,*LPRINTER_ENUM_VALUES;
 #endif
 typedef PRINTER_INFO_1A PRINTER_INFO_1,*PPRINTER_INFO_1,*LPPRINTER_INFO_1;
 typedef PRINTER_INFO_2A PRINTER_INFO_2,*PPRINTER_INFO_2,*LPPRINTER_INFO_2;
@@ -878,6 +927,8 @@ typedef PRINTER_INFO_7A PRINTER_INFO_7,*PPRINTER_INFO_7,*LPPRINTER_INFO_7;
 typedef PRINTPROCESSOR_INFO_1A PRINTPROCESSOR_INFO_1,*PPRINTPROCESSOR_INFO_1,*LPPRINTPROCESSOR_INFO_1;
 typedef FORM_INFO_1A FORM_INFO_1,*PFORM_INFO_1,*LPFORM_INFO_1;
 typedef PRINTER_DEFAULTSA PRINTER_DEFAULTS,*PPRINTER_DEFAULTS,*LPPRINTER_DEFAULTS;
+typedef PROVIDOR_INFO_1A PROVIDOR_INFO_1,*PPROVIDOR_INFO_1,*LPROVIDOR_INFO_1;
+typedef PROVIDOR_INFO_2A PROVIDOR_INFO_2,*PPROVIDOR_INFO_2,*LPROVIDOR_INFO_2;
 #define AddForm AddFormA
 #define AddJob AddJobA
 #define AddMonitor AddMonitorA