Added support for building certain dlls with -DSTRICT.

Added -DWINE_NO_STRICT flag to dlls that don't support STRICT yet.
This commit is contained in:
Alexandre Julliard 2002-10-18 23:46:28 +00:00
parent 168284318b
commit 23bb3715f7
31 changed files with 43 additions and 18 deletions

View File

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

View File

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

View File

@ -1,3 +1,4 @@
EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

View File

@ -1,3 +1,4 @@
EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

View File

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

View File

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

View File

@ -1,3 +1,4 @@
EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

View File

@ -1,3 +1,4 @@
EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

View File

@ -1,3 +1,4 @@
EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

View File

@ -1,3 +1,4 @@
EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

View File

@ -1,3 +1,4 @@
EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

View File

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

View File

@ -1,3 +1,4 @@
EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

View File

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

View File

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

View File

@ -1,3 +1,4 @@
EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

View File

@ -1,3 +1,4 @@
EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

View File

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

View File

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

View File

@ -1,3 +1,4 @@
EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

View File

@ -1,3 +1,4 @@
EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

View File

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

View File

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

View File

@ -1,3 +1,4 @@
EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../.. TOPOBJDIR = ../../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

View File

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

View File

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

View File

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

View File

@ -32,9 +32,15 @@ struct request_max_size
int pad[16]; 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 int obj_handle_t;
typedef unsigned short atom_t;
typedef unsigned int user_handle_t; typedef unsigned int user_handle_t;
#endif
typedef unsigned short atom_t;
typedef unsigned int process_id_t; typedef unsigned int process_id_t;
typedef unsigned int thread_id_t; typedef unsigned int thread_id_t;

View File

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

View File

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

View File

@ -48,9 +48,15 @@ struct request_max_size
int pad[16]; /* the max request size is 16 ints */ 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 int obj_handle_t;
typedef unsigned short atom_t;
typedef unsigned int user_handle_t; typedef unsigned int user_handle_t;
#endif
typedef unsigned short atom_t;
typedef unsigned int process_id_t; typedef unsigned int process_id_t;
typedef unsigned int thread_id_t; typedef unsigned int thread_id_t;