Added support for building certain dlls with -DSTRICT.

dlls/advapi32/Makefile.in

-EXTRADEFS = -D_ADVAPI32_
+EXTRADEFS = -D_ADVAPI32_ -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/comctl32/Makefile.in

-EXTRADEFS = -D_COMCTL32_
+EXTRADEFS = -D_COMCTL32_ -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/commdlg/Makefile.in

+EXTRADEFS = -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/dplayx/Makefile.in

+EXTRADEFS = -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/gdi/Makefile.in

-EXTRADEFS = -D_GDI32_
+EXTRADEFS = -D_GDI32_ -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/imagehlp/Makefile.in

-EXTRADEFS = -D_IMAGEHLP_SOURCE_
+EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/imm32/Makefile.in

+EXTRADEFS = -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/kernel/Makefile.in

+EXTRADEFS = -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/lzexpand/Makefile.in

+EXTRADEFS = -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/mpr/Makefile.in

+EXTRADEFS = -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/msacm/Makefile.in

+EXTRADEFS = -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/msvcrt/Makefile.in

-EXTRADEFS = -DUSE_MSVCRT_PREFIX -D_MT
+EXTRADEFS = -DUSE_MSVCRT_PREFIX -D_MT -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/msvideo/Makefile.in

+EXTRADEFS = -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/ntdll/Makefile.in

-EXTRADEFS = -D_NTSYSTEM_  -DBINDIR="\"$(bindir)\""  -DETCDIR="\"$(sysconfdir)\""
+EXTRADEFS = -D_NTSYSTEM_  -DBINDIR="\"$(bindir)\""  -DETCDIR="\"$(sysconfdir)\"" -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/ole32/Makefile.in

-EXTRADEFS = -D_OLE32_
+EXTRADEFS = -D_OLE32_ -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/oleaut32/Makefile.in

+EXTRADEFS = -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/psapi/Makefile.in

+EXTRADEFS = -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/shell32/Makefile.in

-EXTRADEFS = -D_SHELL32_
+EXTRADEFS = -D_SHELL32_ -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/shlwapi/Makefile.in

-EXTRADEFS = -D_SHLWAPI_
+EXTRADEFS = -D_SHLWAPI_ -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/tapi32/Makefile.in

+EXTRADEFS = -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/ttydrv/Makefile.in

+EXTRADEFS = -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/user/Makefile.in

-EXTRADEFS = -D_USER32_ -D_WINABLE_
+EXTRADEFS = -D_USER32_ -D_WINABLE_ -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/winmm/Makefile.in

-EXTRADEFS = -D_WINMM_
+EXTRADEFS = -D_WINMM_ -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/winmm/wavemap/Makefile.in

+EXTRADEFS = -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@

dlls/winsock/Makefile.in

-EXTRADEFS = -DUSE_WS_PREFIX
+EXTRADEFS = -DUSE_WS_PREFIX -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/winspool/Makefile.in

-EXTRADEFS = -D_SPOOL32_
+EXTRADEFS = -D_SPOOL32_ -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/x11drv/Makefile.in

-EXTRADEFS = -DBINDIR="\"$(bindir)\""
+EXTRADEFS = -DBINDIR="\"$(bindir)\"" -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

include/wine/server_protocol.h

@@ -32,9 +32,15 @@ struct request_max_size
     int pad[16];
 };
 
+#if defined(STRICT) || (defined(__WINE__) && !defined(WINE_NO_STRICT))
+typedef void *obj_handle_t;
+typedef void *user_handle_t;
+#else
 typedef int obj_handle_t;
-typedef unsigned short atom_t;
 typedef unsigned int user_handle_t;
+#endif
+
+typedef unsigned short atom_t;
 typedef unsigned int process_id_t;
 typedef unsigned int thread_id_t;
 

include/winnt.h

@@ -561,7 +561,7 @@ typedef DWORD		EXECUTION_STATE;
  * we're ready we'll remove the '!defined(__WINE__)' (the equivalent
  * of converting it from DECLARE_OLD_HANDLE to DECLARE_HANDLE).
  */
-#if defined(STRICT) && !defined(__WINE__)
+#if defined(STRICT) || (defined(__WINE__) && !defined(WINE_NO_STRICT))
 typedef VOID*           HANDLE;
 #define DECLARE_OLD_HANDLE(a) \
     typedef struct a##__ { int unused; } *a; \

server/Makefile.in

-DEFS      = -D__WINE__
+DEFS      = -D__WINE__ -DWINE_NO_STRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ..
 SRCDIR    = @srcdir@

server/protocol.def

@@ -48,9 +48,15 @@ struct request_max_size
     int pad[16]; /* the max request size is 16 ints */
 };
 
+#if defined(STRICT) || (defined(__WINE__) && !defined(WINE_NO_STRICT))
+typedef void *obj_handle_t;
+typedef void *user_handle_t;
+#else
 typedef int obj_handle_t;
-typedef unsigned short atom_t;
 typedef unsigned int user_handle_t;
+#endif
+
+typedef unsigned short atom_t;
 typedef unsigned int process_id_t;
 typedef unsigned int thread_id_t;