--- pmsdk/include/pmavio.h	2018/08/09 12:28:13	1.1
+++ pmsdk/include/pmavio.h	2018/08/09 12:28:35	1.1.1.2
@@ -4,16 +4,26 @@
 *
 * OS/2 Presentation Manager AVIO constants, types and function declarations
 *
-* Copyright (c) 1987  IBM Corporation
-* Copyright (c) 1987  Microsoft Corporation
+*
+* Copyright (c) 1989  Microsoft Corporation
 *
 \***************************************************************************/
- 
+
 /* common types, constants and function declarations */
- 
+
 typedef USHORT HVPS;        /* hpvs */
 typedef HVPS far *PHVPS;    /* phpvs */
- 
+
+/* VioCreatePS format constants */
+
+#define FORMAT_CGA    0x0001
+#define FORMAT_4BYTE  0x0003
+
+/* options for VioQueryFonts */
+
+#define VQF_PUBLIC               0x0001L
+#define VQF_PRIVATE              0x0002L
+
 USHORT APIENTRY VioAssociate( HDC, HVPS );
 USHORT APIENTRY VioCreateLogFont( PFATTRS, LONG, PSTR8, HVPS );
 USHORT APIENTRY VioCreatePS( PHVPS, SHORT, SHORT, SHORT, SHORT, HVPS );
@@ -21,17 +31,17 @@ USHORT APIENTRY VioDestroyPS( HVPS );
 USHORT APIENTRY VioDeleteSetId( LONG, HVPS );
 USHORT APIENTRY VioGetDeviceCellSize( PSHORT, PSHORT, HVPS );
 USHORT APIENTRY VioGetOrg( PSHORT, PSHORT, HVPS );
-USHORT APIENTRY VioQueryFonts( PLONG, PFONTMETRICS, LONG, PLONG, PSZ, HVPS );
+USHORT APIENTRY VioQueryFonts( PLONG, PFONTMETRICS, LONG, PLONG
+                             , PSZ, ULONG, HVPS );
 USHORT APIENTRY VioQuerySetIds( PLONG, PSTR8, PLONG, LONG, HVPS );
 USHORT APIENTRY VioSetDeviceCellSize( SHORT, SHORT, HVPS );
 USHORT APIENTRY VioSetOrg( SHORT, SHORT, HVPS );
 USHORT APIENTRY VioShowPS( SHORT, SHORT, SHORT, HVPS );
- 
+
 /************************ Public Function ******************************\
  *
  * WinDefAVioWindowProc -- Default message processing for AVio PS's
  *
 \***********************************************************************/
- 
-MRESULT FAR PASCAL WinDefAVioWindowProc(HWND, USHORT, MPARAM, MPARAM);
- 
+
+MRESULT APIENTRY WinDefAVioWindowProc(HWND, USHORT, MPARAM, MPARAM);