*** g:\mssdk\INCLUDE\MMSystem.h	Fri Aug  9 02:30:00 1996
--- MMSystem.h	Sun Jan  3 12:58:26 1999
***************
*** 357,363 ****
  #ifdef _WIN32
   #ifndef _WIN32_VXD
  
! typedef LRESULT (CALLBACK* DRIVERPROC)(DWORD, HDRVR, UINT, LPARAM, LPARAM);
  
  WINMMAPI LRESULT   WINAPI CloseDriver(HDRVR hDriver, LONG lParam1, LONG lParam2);
  WINMMAPI HDRVR     WINAPI OpenDriver(LPCWSTR szDriverName, LPCWSTR szSectionName, LONG lParam2);
--- 357,363 ----
  #ifdef _WIN32
   #ifndef _WIN32_VXD
  
! typedef LRESULT CALLBACK (*DRIVERPROC)(DWORD, HDRVR, UINT, LPARAM, LPARAM);
  
  WINMMAPI LRESULT   WINAPI CloseDriver(HDRVR hDriver, LONG lParam1, LONG lParam2);
  WINMMAPI HDRVR     WINAPI OpenDriver(LPCWSTR szDriverName, LPCWSTR szSectionName, LONG lParam2);
***************
*** 411,417 ****
  
  #ifndef _WIN32_VXD 
  
! typedef void (CALLBACK DRVCALLBACK)(HDRVR hdrvr, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2);
  
  typedef DRVCALLBACK FAR *LPDRVCALLBACK;
  #ifdef _WIN32
--- 411,417 ----
  
  #ifndef _WIN32_VXD 
  
! typedef void CALLBACK (DRVCALLBACK)(HDRVR hdrvr, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2);
  
  typedef DRVCALLBACK FAR *LPDRVCALLBACK;
  #ifdef _WIN32
***************
*** 1620,1630 ****
  	struct {
  	    LONG    lMinimum;           /* signed minimum for this control */
  	    LONG    lMaximum;           /* signed maximum for this control */
! 	};
  	struct {
  	    DWORD   dwMinimum;          /* unsigned minimum for this control */
  	    DWORD   dwMaximum;          /* unsigned maximum for this control */
! 	};
  	DWORD       dwReserved[6];
      } Bounds;
      union {
--- 1620,1630 ----
          struct {
              LONG    lMinimum;           /* signed minimum for this control */
              LONG    lMaximum;           /* signed maximum for this control */
!         }s1;
          struct {
              DWORD   dwMinimum;          /* unsigned minimum for this control */
              DWORD   dwMaximum;          /* unsigned maximum for this control */
!         }s2;
          DWORD       dwReserved[6];
      } Bounds;
      union {
***************
*** 1645,1655 ****
  	struct {
  	    LONG    lMinimum;           /* signed minimum for this control */
  	    LONG    lMaximum;           /* signed maximum for this control */
! 	};
  	struct {
  	    DWORD   dwMinimum;          /* unsigned minimum for this control */
  	    DWORD   dwMaximum;          /* unsigned maximum for this control */
! 	};
  	DWORD       dwReserved[6];
      } Bounds;
      union {
--- 1645,1655 ----
          struct {
              LONG    lMinimum;           /* signed minimum for this control */
              LONG    lMaximum;           /* signed maximum for this control */
!         }s1;
          struct {
              DWORD   dwMinimum;          /* unsigned minimum for this control */
              DWORD   dwMaximum;          /* unsigned maximum for this control */
!         }s2;
          DWORD       dwReserved[6];
      } Bounds;
      union {
***************
*** 1959,1965 ****
  #define TIMERR_STRUCT         (TIMERR_BASE+33)     /* time struct size */
  
  /* timer data types */
! typedef void (CALLBACK TIMECALLBACK)(UINT uTimerID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2);
  
  typedef TIMECALLBACK FAR *LPTIMECALLBACK;
  
--- 1959,1965 ----
  #define TIMERR_STRUCT         (TIMERR_BASE+33)     /* time struct size */
  
  /* timer data types */
! typedef void CALLBACK (TIMECALLBACK)(UINT uTimerID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2);
  
  typedef TIMECALLBACK FAR *LPTIMECALLBACK;
  
***************
*** 2288,2294 ****
  typedef DWORD           FOURCC;         /* a four character code */
  typedef char _huge *    HPSTR;          /* a huge version of LPSTR */
  DECLARE_HANDLE(HMMIO);                  /* a handle to an open file */
! typedef LRESULT (CALLBACK MMIOPROC)(LPSTR lpmmioinfo, UINT uMsg,
  	    LPARAM lParam1, LPARAM lParam2);
  typedef MMIOPROC FAR *LPMMIOPROC;
  
--- 2288,2294 ----
  typedef DWORD           FOURCC;         /* a four character code */
  typedef char _huge *    HPSTR;          /* a huge version of LPSTR */
  DECLARE_HANDLE(HMMIO);                  /* a handle to an open file */
! typedef LRESULT CALLBACK (MMIOPROC)(LPSTR lpmmioinfo, UINT uMsg,
              LPARAM lParam1, LPARAM lParam2);
  typedef MMIOPROC FAR *LPMMIOPROC;
  
***************
*** 2486,2492 ****
  typedef UINT    MCIDEVICEID;    /* MCI device ID type */
  #endif
  
! typedef UINT (CALLBACK *YIELDPROC)(MCIDEVICEID mciId, DWORD dwYieldData);
  
  /* MCI function prototypes */
  #ifdef _WIN32
--- 2486,2492 ----
  typedef UINT    MCIDEVICEID;    /* MCI device ID type */
  #endif
  
! typedef UINT CALLBACK (*YIELDPROC)(MCIDEVICEID mciId, DWORD dwYieldData);
  
  /* MCI function prototypes */
  #ifdef _WIN32