*** g:\mssdk\INCLUDE\WinGDI.h	Fri Jul 31 16:42:46 1998
--- WinGDI.h	Sat Jan  2 23:49:28 1999
***************
*** 1834,1842 ****
          short dmPaperSize;
          short dmPaperLength;
          short dmPaperWidth;
!       };
        POINTL dmPosition;
!     };
      short dmScale;
      short dmCopies;
      short dmDefaultSource;
--- 1834,1842 ----
          short dmPaperSize;
          short dmPaperLength;
          short dmPaperWidth;
!       }s;
        POINTL dmPosition;
!     }u1;
      short dmScale;
      short dmCopies;
      short dmDefaultSource;
***************
*** 1854,1860 ****
      union {
          DWORD  dmDisplayFlags;
          DWORD  dmNup;
!     };
      DWORD  dmDisplayFrequency;
  #if(WINVER >= 0x0400)
      DWORD  dmICMMethod;
--- 1854,1860 ----
      union {
          DWORD  dmDisplayFlags;
          DWORD  dmNup;
!     }u2;
      DWORD  dmDisplayFrequency;
  #if(WINVER >= 0x0400)
      DWORD  dmICMMethod;
***************
*** 1882,1890 ****
          short dmPaperSize;
          short dmPaperLength;
          short dmPaperWidth;
!       };
        POINTL dmPosition;
!     };
      short dmScale;
      short dmCopies;
      short dmDefaultSource;
--- 1882,1890 ----
          short dmPaperSize;
          short dmPaperLength;
          short dmPaperWidth;
!       }s;
        POINTL dmPosition;
!     }u1;
      short dmScale;
      short dmCopies;
      short dmDefaultSource;
***************
*** 1902,1908 ****
      union {
          DWORD  dmDisplayFlags;
          DWORD  dmNup;
!     };
      DWORD  dmDisplayFrequency;
  #if(WINVER >= 0x0400)
      DWORD  dmICMMethod;
--- 1902,1908 ----
      union {
          DWORD  dmDisplayFlags;
          DWORD  dmNup;
!     }u2;
      DWORD  dmDisplayFrequency;
  #if(WINVER >= 0x0400)
      DWORD  dmICMMethod;
***************
*** 2617,2632 ****
  
  #ifdef STRICT
  #if !defined(NOTEXTMETRIC)
! typedef int (CALLBACK* OLDFONTENUMPROCA)(CONST LOGFONTA *, CONST TEXTMETRICA *, DWORD, LPARAM);
! typedef int (CALLBACK* OLDFONTENUMPROCW)(CONST LOGFONTW *, CONST TEXTMETRICW *, DWORD, LPARAM);
  #ifdef UNICODE
  #define OLDFONTENUMPROC  OLDFONTENUMPROCW
  #else
  #define OLDFONTENUMPROC  OLDFONTENUMPROCA
  #endif // !UNICODE
  #else
! typedef int (CALLBACK* OLDFONTENUMPROCA)(CONST LOGFONTA *, CONST VOID *, DWORD, LPARAM);
! typedef int (CALLBACK* OLDFONTENUMPROCW)(CONST LOGFONTW *, CONST VOID *, DWORD, LPARAM);
  #ifdef UNICODE
  #define OLDFONTENUMPROC  OLDFONTENUMPROCW
  #else
--- 2617,2632 ----
  
  #ifdef STRICT
  #if !defined(NOTEXTMETRIC)
! typedef int CALLBACK (*OLDFONTENUMPROCA)(CONST LOGFONTA *, CONST TEXTMETRICA *, DWORD, LPARAM);
! typedef int CALLBACK (*OLDFONTENUMPROCW)(CONST LOGFONTW *, CONST TEXTMETRICW *, DWORD, LPARAM);
  #ifdef UNICODE
  #define OLDFONTENUMPROC  OLDFONTENUMPROCW
  #else
  #define OLDFONTENUMPROC  OLDFONTENUMPROCA
  #endif // !UNICODE
  #else
! typedef int CALLBACK (*OLDFONTENUMPROCA)(CONST LOGFONTA *, CONST VOID *, DWORD, LPARAM);
! typedef int CALLBACK (*OLDFONTENUMPROCW)(CONST LOGFONTW *, CONST VOID *, DWORD, LPARAM);
  #ifdef UNICODE
  #define OLDFONTENUMPROC  OLDFONTENUMPROCW
  #else
***************
*** 2642,2649 ****
  typedef FONTENUMPROCA FONTENUMPROC;
  #endif // UNICODE
  
! typedef int (CALLBACK* GOBJENUMPROC)(LPVOID, LPARAM);
! typedef VOID (CALLBACK* LINEDDAPROC)(int, int, LPARAM);
  #else
  typedef FARPROC OLDFONTENUMPROC;
  typedef FARPROC FONTENUMPROCA;
--- 2642,2649 ----
  typedef FONTENUMPROCA FONTENUMPROC;
  #endif // UNICODE
  
! typedef int CALLBACK (*GOBJENUMPROC)(LPVOID, LPARAM);
! typedef VOID CALLBACK (*LINEDDAPROC)(int, int, LPARAM);
  #else
  typedef FARPROC OLDFONTENUMPROC;
  typedef FARPROC FONTENUMPROCA;
***************
*** 2761,2769 ****
   * functions for Win 3.1 compatibility
   */
  
! typedef UINT   (CALLBACK* LPFNDEVMODE)(HWND, HMODULE, LPDEVMODE, LPSTR, LPSTR, LPDEVMODE, LPSTR, UINT);
  
! typedef DWORD  (CALLBACK* LPFNDEVCAPS)(LPSTR, LPSTR, UINT, LPSTR, LPDEVMODE);
  
  /* mode selections for the device mode function */
  #define DM_UPDATE           1
--- 2761,2769 ----
   * functions for Win 3.1 compatibility
   */
  
! typedef UINT   CALLBACK (*LPFNDEVMODE)(HWND, HMODULE, LPDEVMODE, LPSTR, LPSTR, LPDEVMODE, LPSTR, UINT);
  
! typedef DWORD  CALLBACK (*LPFNDEVCAPS)(LPSTR, LPSTR, UINT, LPSTR, LPDEVMODE);
  
  /* mode selections for the device mode function */
  #define DM_UPDATE           1
***************
*** 3420,3429 ****
  #ifndef NOMETAFILE
  
  WINGDIAPI BOOL  WINAPI PlayMetaFileRecord( IN HDC, IN LPHANDLETABLE, IN LPMETARECORD, IN UINT);
! typedef int (CALLBACK* MFENUMPROC)( IN HDC, IN HANDLETABLE FAR*, IN METARECORD FAR*, IN int, IN LPARAM);
  WINGDIAPI BOOL  WINAPI EnumMetaFile(  IN HDC, IN HMETAFILE, IN MFENUMPROC, IN LPARAM);
  
! typedef int (CALLBACK* ENHMFENUMPROC)(HDC, HANDLETABLE FAR*, CONST ENHMETARECORD *, int, LPARAM);
  
  // Enhanced Metafile Function Declarations
  
--- 3420,3429 ----
  #ifndef NOMETAFILE
  
  WINGDIAPI BOOL  WINAPI PlayMetaFileRecord( IN HDC, IN LPHANDLETABLE, IN LPMETARECORD, IN UINT);
! typedef int CALLBACK (*MFENUMPROC)( IN HDC, IN HANDLETABLE FAR*, IN METARECORD FAR*, IN int, IN LPARAM);
  WINGDIAPI BOOL  WINAPI EnumMetaFile(  IN HDC, IN HMETAFILE, IN MFENUMPROC, IN LPARAM);
  
! typedef int CALLBACK (*ENHMFENUMPROC)(HDC, HANDLETABLE FAR*, CONST ENHMETARECORD *, int, LPARAM);
  
  // Enhanced Metafile Function Declarations
  
***************
*** 3560,3566 ****
  WINGDIAPI HPALETTE WINAPI CreateHalftonePalette( IN HDC);
  
  #ifdef STRICT
! typedef BOOL (CALLBACK* ABORTPROC)( IN HDC, IN int);
  #else
  typedef FARPROC ABORTPROC;
  #endif
--- 3560,3566 ----
  WINGDIAPI HPALETTE WINAPI CreateHalftonePalette( IN HDC);
  
  #ifdef STRICT
! typedef BOOL CALLBACK (*ABORTPROC)( IN HDC, IN int);
  #else
  typedef FARPROC ABORTPROC;
  #endif
***************
*** 3723,3730 ****
  #define ICM_QUERY             3
  #define ICM_DONE_OUTSIDEDC    4
  
! typedef int (CALLBACK* ICMENUMPROCA)(LPSTR, LPARAM);
! typedef int (CALLBACK* ICMENUMPROCW)(LPWSTR, LPARAM);
  #ifdef UNICODE
  #define ICMENUMPROC  ICMENUMPROCW
  #else
--- 3723,3730 ----
  #define ICM_QUERY             3
  #define ICM_DONE_OUTSIDEDC    4
  
! typedef int CALLBACK (*ICMENUMPROCA)(LPSTR, LPARAM);
! typedef int CALLBACK (*ICMENUMPROCW)(LPWSTR, LPARAM);
  #ifdef UNICODE
  #define ICMENUMPROC  ICMENUMPROCW
  #else