Hello, i'm not 100% sure what -DWINE_NO_STRICT should do, but i suspect it should negate the effect of -DSTRICT. The attached patch enables that and lets wine compile with -DSTRICT where WINE_NO_STRICT isn't defined. Comments? bye michael P.S.: is this -DSTRICT a m$ windows thing or a wine only thing? -- Michael Stefaniuc Tel.: +49-711-96437-199 System Administration Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani@redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart
Index: Make.rules.in
===================================================================
RCS file: /home/wine/wine/Make.rules.in,v
retrieving revision 1.131
diff -u -r1.131 Make.rules.in
--- Make.rules.in 19 Oct 2002 17:15:00 -0000 1.131
+++ Make.rules.in 21 Oct 2002 19:31:47 -0000
@@ -25,7 +25,7 @@
CC = @CC@
CPP = @CPP@
CFLAGS = @CFLAGS@ $(EXTRACFLAGS)
-OPTIONS = @OPTIONS@ -D_REENTRANT
+OPTIONS = @OPTIONS@ -D_REENTRANT -DSTRICT
LIBS = @LIBS@
YACC = @YACC@
LEX = @LEX@
Index: include/winnt.h
===================================================================
RCS file: /home/wine/wine/include/winnt.h,v
retrieving revision 1.134
diff -u -r1.134 winnt.h
--- include/winnt.h 19 Oct 2002 17:20:02 -0000 1.134
+++ include/winnt.h 21 Oct 2002 19:31:48 -0000
@@ -561,14 +561,14 @@
* we're ready we'll remove the '!defined(__WINE__)' (the equivalent
* of converting it from DECLARE_OLD_HANDLE to DECLARE_HANDLE).
*/
-#if defined(__WINE__) && defined(WINE_NO_STRICT)
-typedef UINT HANDLE;
-#else
+#if defined(STRICT) && !defined(WINE_NO_STRICT)
typedef void *HANDLE;
+#else
+typedef UINT HANDLE;
#endif
typedef HANDLE *PHANDLE, *LPHANDLE;
-#if defined(STRICT) || (defined(__WINE__) && !defined(WINE_NO_STRICT))
+#if defined(STRICT) && !defined(WINE_NO_STRICT)
#define DECLARE_HANDLE(a) \
typedef struct a##__ { int unused; } *a; \
typedef a *P##a
Index: include/wine/server_protocol.h
===================================================================
RCS file: /home/wine/wine/include/wine/server_protocol.h,v
retrieving revision 1.46
diff -u -r1.46 server_protocol.h
--- include/wine/server_protocol.h 18 Oct 2002 23:46:28 -0000 1.46
+++ include/wine/server_protocol.h 21 Oct 2002 19:31:49 -0000
@@ -32,7 +32,7 @@
int pad[16];
};
-#if defined(STRICT) || (defined(__WINE__) && !defined(WINE_NO_STRICT))
+#if defined(STRICT) && !defined(WINE_NO_STRICT)
typedef void *obj_handle_t;
typedef void *user_handle_t;
#else
Index: dlls/twain/ds_image.c
===================================================================
RCS file: /home/wine/wine/dlls/twain/ds_image.c,v
retrieving revision 1.2
diff -u -r1.2 ds_image.c
--- dlls/twain/ds_image.c 31 May 2002 23:40:53 -0000 1.2
+++ dlls/twain/ds_image.c 21 Oct 2002 19:31:49 -0000
@@ -276,7 +276,7 @@
sane_cancel (pSource->deviceHandle);
ReleaseDC (pSource->hwndOwner, dc);
- *pHandle = hDIB;
+ *pHandle = (TW_UINT32)hDIB;
twRC = TWRC_XFERDONE;
pSource->twCC = TWCC_SUCCESS;
pSource->currentState = 7;
Attachment:
pgp00059.pgp
Description: PGP signature
