Force STRICT checking of callback function types when compiling Wine.

include/winnls.h

@@ -10,7 +10,7 @@ extern "C" {
 
 /* Define a bunch of callback types */
 
-#ifdef STRICT
+#if defined(STRICT) || defined(__WINE__)
 typedef BOOL    CALLBACK (*CALINFO_ENUMPROCA)(LPSTR);
 typedef BOOL    CALLBACK (*CALINFO_ENUMPROCW)(LPWSTR);
 typedef BOOL    CALLBACK (*CODEPAGE_ENUMPROCA)(LPSTR);
@@ -32,7 +32,7 @@ typedef FARPROC LOCALE_ENUMPROCA;
 typedef FARPROC LOCALE_ENUMPROCW;
 typedef FARPROC TIMEFMT_ENUMPROCA;
 typedef FARPROC TIMEFMT_ENUMPROCW;
-#endif /* STRICT */
+#endif /* STRICT || __WINE__ */
 
 DECL_WINELIB_TYPE_AW(CALINFO_ENUMPROC)
 DECL_WINELIB_TYPE_AW(CODEPAGE_ENUMPROC)

include/winuser.h

@@ -14,7 +14,7 @@ extern "C" {
 
 /* Define a bunch of callback types */
 
-#ifdef STRICT
+#if defined(STRICT) || defined(__WINE__)
 typedef BOOL    CALLBACK (*DLGPROC)(HWND,UINT,WPARAM,LPARAM);
 typedef BOOL    CALLBACK (*DRAWSTATEPROC)(HDC,LPARAM,WPARAM,int,int);
 typedef INT     CALLBACK (*EDITWORDBREAKPROCA)(LPSTR,INT,INT,INT);
@@ -25,8 +25,8 @@ typedef BOOL    CALLBACK (*NAMEENUMPROCA)(LPSTR,LPARAM);
 typedef BOOL    CALLBACK (*NAMEENUMPROCW)(LPWSTR,LPARAM);
 typedef BOOL    CALLBACK (*PROPENUMPROCA)(HWND,LPCSTR,HANDLE);
 typedef BOOL    CALLBACK (*PROPENUMPROCW)(HWND,LPCWSTR,HANDLE);
-typedef BOOL    CALLBACK (*PROPENUMPROCEXA)(HWND,LPCSTR,HANDLE,DWORD);
-typedef BOOL    CALLBACK (*PROPENUMPROCEXW)(HWND,LPCWSTR,HANDLE,DWORD);
+typedef BOOL    CALLBACK (*PROPENUMPROCEXA)(HWND,LPCSTR,HANDLE,ULONG_PTR);
+typedef BOOL    CALLBACK (*PROPENUMPROCEXW)(HWND,LPCWSTR,HANDLE,ULONG_PTR);
 typedef VOID    CALLBACK (*SENDASYNCPROC)(HWND,UINT,ULONG_PTR,LRESULT);
 typedef VOID    CALLBACK (*TIMERPROC)(HWND,UINT,UINT,DWORD);
 typedef BOOL    CALLBACK (*WNDENUMPROC)(HWND,LPARAM);
@@ -46,7 +46,7 @@ typedef FARPROC PROPENUMPROCEXW;
 typedef FARPROC SENDASYNCPROC;
 typedef FARPROC TIMERPROC;
 typedef FARPROC WNDENUMPROC;
-#endif /* STRICT */
+#endif /* STRICT || __WINE__ */
 
 typedef NAMEENUMPROCA WINSTAENUMPROCA;
 typedef NAMEENUMPROCA DESKTOPENUMPROCA;