*** g:\mssdk\INCLUDE\WinUser.h	Wed Aug  5 18:19:00 1998
--- WinUser.h	Sat Jan  2 23:50:46 1999
***************
*** 54,81 ****
  typedef LPMENUTEMPLATEA LPMENUTEMPLATE;
  #endif // UNICODE
  
! typedef LRESULT (CALLBACK* WNDPROC)(HWND, UINT, WPARAM, LPARAM);
  
  #ifdef STRICT
  
! typedef INT_PTR (CALLBACK* DLGPROC)(HWND, UINT, WPARAM, LPARAM);
! typedef VOID (CALLBACK* TIMERPROC)(HWND, UINT, UINT_PTR, DWORD);
! typedef BOOL (CALLBACK* GRAYSTRINGPROC)(HDC, LPARAM, int);
! typedef BOOL (CALLBACK* WNDENUMPROC)(HWND, LPARAM);
! typedef LRESULT (CALLBACK* HOOKPROC)(int code, WPARAM wParam, LPARAM lParam);
! typedef VOID (CALLBACK* SENDASYNCPROC)(HWND, UINT, ULONG_PTR, LRESULT);
  
! typedef BOOL (CALLBACK* PROPENUMPROCA)(HWND, LPCSTR, HANDLE);
! typedef BOOL (CALLBACK* PROPENUMPROCW)(HWND, LPCWSTR, HANDLE);
  
! typedef BOOL (CALLBACK* PROPENUMPROCEXA)(HWND, LPSTR, HANDLE, ULONG_PTR);
! typedef BOOL (CALLBACK* PROPENUMPROCEXW)(HWND, LPWSTR, HANDLE, ULONG_PTR);
  
! typedef int (CALLBACK* EDITWORDBREAKPROCA)(LPSTR lpch, int ichCurrent, int cch, int code);
! typedef int (CALLBACK* EDITWORDBREAKPROCW)(LPWSTR lpch, int ichCurrent, int cch, int code);
  
  #if(WINVER >= 0x0400)
! typedef BOOL (CALLBACK* DRAWSTATEPROC)(HDC hdc, LPARAM lData, WPARAM wData, int cx, int cy);
  #endif /* WINVER >= 0x0400 */
  #else /* !STRICT */
  
--- 54,81 ----
  typedef LPMENUTEMPLATEA LPMENUTEMPLATE;
  #endif // UNICODE
  
! typedef LRESULT CALLBACK (*WNDPROC)(HWND, UINT, WPARAM, LPARAM);
  
  #ifdef STRICT
  
! typedef INT_PTR CALLBACK (*DLGPROC)(HWND, UINT, WPARAM, LPARAM);
! typedef VOID CALLBACK (*TIMERPROC)(HWND, UINT, UINT_PTR, DWORD);
! typedef BOOL CALLBACK (*GRAYSTRINGPROC)(HDC, LPARAM, int);
! typedef BOOL CALLBACK (*WNDENUMPROC)(HWND, LPARAM);
! typedef LRESULT CALLBACK (*HOOKPROC)(int code, WPARAM wParam, LPARAM lParam);
! typedef VOID CALLBACK (*SENDASYNCPROC)(HWND, UINT, ULONG_PTR, LRESULT);
  
! typedef BOOL CALLBACK (*PROPENUMPROCA)(HWND, LPCSTR, HANDLE);
! typedef BOOL CALLBACK (*PROPENUMPROCW)(HWND, LPCWSTR, HANDLE);
  
! typedef BOOL CALLBACK (*PROPENUMPROCEXA)(HWND, LPSTR, HANDLE, ULONG_PTR);
! typedef BOOL CALLBACK (*PROPENUMPROCEXW)(HWND, LPWSTR, HANDLE, ULONG_PTR);
  
! typedef int CALLBACK (*EDITWORDBREAKPROCA)(LPSTR lpch, int ichCurrent, int cch, int code);
! typedef int CALLBACK (*EDITWORDBREAKPROCW)(LPWSTR lpch, int ichCurrent, int cch, int code);
  
  #if(WINVER >= 0x0400)
! typedef BOOL CALLBACK (*DRAWSTATEPROC)(HDC hdc, LPARAM lData, WPARAM wData, int cx, int cy);
  #endif /* WINVER >= 0x0400 */
  #else /* !STRICT */
  
***************
*** 112,119 ****
  
  #ifdef STRICT
  
! typedef BOOL (CALLBACK* NAMEENUMPROCA)(LPSTR, LPARAM);
! typedef BOOL (CALLBACK* NAMEENUMPROCW)(LPWSTR, LPARAM);
  
  typedef NAMEENUMPROCA   WINSTAENUMPROCA;
  typedef NAMEENUMPROCA   DESKTOPENUMPROCA;
--- 112,119 ----
  
  #ifdef STRICT
  
! typedef BOOL CALLBACK (*NAMEENUMPROCA)(LPSTR, LPARAM);
! typedef BOOL CALLBACK (*NAMEENUMPROCW)(LPWSTR, LPARAM);
  
  typedef NAMEENUMPROCA   WINSTAENUMPROCA;
  typedef NAMEENUMPROCA   DESKTOPENUMPROCA;
***************
*** 6486,6492 ****
  
  #if(WINVER >= 0x0400)
  
! typedef void (CALLBACK *MSGBOXCALLBACK)(LPHELPINFO lpHelpInfo);
  
  typedef struct tagMSGBOXPARAMSA
  {
--- 6486,6492 ----
  
  #if(WINVER >= 0x0400)
  
! typedef void CALLBACK (*MSGBOXCALLBACK)(LPHELPINFO lpHelpInfo);
  
  typedef struct tagMSGBOXPARAMSA
  {
***************
*** 9834,9840 ****
  #define GetMonitorInfo  GetMonitorInfoA
  #endif // !UNICODE
  
! typedef BOOL (CALLBACK* MONITORENUMPROC)(HMONITOR, HDC, LPRECT, LPARAM);
  
  WINUSERAPI
  BOOL
--- 9834,9840 ----
  #define GetMonitorInfo  GetMonitorInfoA
  #endif // !UNICODE
  
! typedef BOOL CALLBACK (*MONITORENUMPROC)(HMONITOR, HDC, LPRECT, LPARAM);
  
  WINUSERAPI
  BOOL
***************
*** 9861,9867 ****
      IN LONG  idObject,
      IN LONG  idChild);
  
! typedef VOID (CALLBACK* WINEVENTPROC)(
      HWINEVENTHOOK hWinEventHook,
      DWORD         event,
      HWND          hwnd,
--- 9861,9867 ----
      IN LONG  idObject,
      IN LONG  idChild);
  
! typedef VOID CALLBACK (*WINEVENTPROC)(
      HWINEVENTHOOK hWinEventHook,
      DWORD         event,
      HWND          hwnd,