From 8f31f3f481ee4f71c5f93f5264dc35eae5bd1803 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Thu, 30 Mar 2006 04:01:43 +0000 Subject: [PATCH] * include/winspool.h: Protect use of PRINTER_ENUM_VALUESW with proper version conditional. --- winsup/w32api/ChangeLog | 20 +++++++++++++++++--- winsup/w32api/include/winspool.h | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index f892762f2..799096ab8 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,4 +1,10 @@ +2006-03-29 Christopher Faylor + + * include/winspool.h: Protect use of PRINTER_ENUM_VALUESW with proper + version conditional. + 2006-03-29 Dimitri Papadopoulos + * include/winspool.h (JOB_INFO_3): Add structure. (PROVIDOR_INFO_*{AW}): Add structure. * include/winspool.h [_WIN32_WINNT >= 0x0500] @@ -6,16 +12,19 @@ (PRINTPROCESSOR_CAPS): Add structure. 2006-03-29 Dimitri Papadopoulos + * include/winspool.h [_WIN32_WINNT >= 0x0500] (PRINTER_INFO_7A): Correct definition. 2006-03-29 Dimitri Papadopoulos + * include/winspool.h [_WIN32_WINNT >= 0x0500] (DRIVER_INFO_*{AW}): Add structure. (PRINTER_INFO_*{AW}): Add structure. Thanks to: Roland Schwingel 2006-03-29 Dimitri Papadopoulos + * include/winspool.h [_WIN32_WINNT >= 0x0500] (DRIVER_*MODE): Define (DWORD type). Thanks to: Roland Schwingel @@ -30,13 +39,13 @@ 2006-03-26 Chris Sutcliffe - * include/winbase.h (SetProcessWorkingSetSize): Corrected define. + * include/winbase.h (SetProcessWorkingSetSize): Corrected define. 2006-03-26 Hansres Engel Add Uniscribe API for typography and for complex scripts. - * include/usp10.h: New file. - * lib/usp10.def: New file. + * include/usp10.h: New file. + * lib/usp10.def: New file. * include/winver.h: Change first argument of GetFileVersionInfo[...] to const. @@ -68,6 +77,7 @@ (STATUS_DLL_INIT_FAILED_LOGOFF): Ditto. 2006-03-09 Dimitri Papadopoulos + * include/winspool.h (DI_MEMORYMAP_WRITE): Define (DWORD type). (FORM_USER,FORM_PRINTER): Define (DWORD type). * include/winspool.h [_WIN32_WINNT >= 0x0500] @@ -75,21 +85,25 @@ Thanks to: Roland Schwingel 2006-03-09 Dimitri Papadopoulos + * include/winspool.h (JOB_CONTROL_*,JOB_STATUS_*): Define. Thanks to: Roland Schwingel 2006-03-07 Dimitri Papadopoulos + * include/shellapi.h [_WIN32_IE >= 0x0600] (SEE_MASK_NOZONECHECKS,SEE_MASK_FLAG_LOG_USAGE): Define on Windows XP SP1 and Windows XP respectively. 2006-03-07 Dimitri Papadopoulos + * include/shellapi.h (NOTIFYICONDATA_V*_SIZE): Define. Thanks to: Daniel Atallah * include/shellapi.h [_WIN32_IE >= 0x0500] (NIS_*): Introduced in Version 5.0. 2006-03-06 Danny Smith + * include/wingdi.h (CS_*): Correct WINVER guard on Image Color Matching colour definitions. diff --git a/winsup/w32api/include/winspool.h b/winsup/w32api/include/winspool.h index 2492d61da..a7d489201 100644 --- a/winsup/w32api/include/winspool.h +++ b/winsup/w32api/include/winspool.h @@ -837,8 +837,8 @@ typedef DRIVER_INFO_3W DRIVER_INFO_3,*PDRIVER_INFO_3,*LPDRIVER_INFO_3; 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; +#endif 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;