[WINE]

Try to fix some warnings in wine tests

svn path=/trunk/; revision=63514

diff --git a/reactos/include/reactos/wine/exception.h b/reactos/include/reactos/wine/exception.h
index 611316b..5a5e7f7 100644 (file)
--- a/reactos/include/reactos/wine/exception.h
+++ b/reactos/include/reactos/wine/exception.h
@@ -25,10 +25,16 @@ extern "C" {
 #define EXCEPTION_VM86_PICRETURN  0x80000112
 
 #ifndef _RTLTYPES_H
 #define EXCEPTION_VM86_PICRETURN  0x80000112
 
 #ifndef _RTLTYPES_H

-typedef EXCEPTION_DISPOSITION (*PEXCEPTION_HANDLER)
-               (struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*);
-

 struct _EXCEPTION_REGISTRATION_RECORD;
 struct _EXCEPTION_REGISTRATION_RECORD;

+
+typedef
+DWORD
+(*PEXCEPTION_HANDLER)(
+    struct _EXCEPTION_RECORD*,
+    struct _EXCEPTION_REGISTRATION_RECORD *,
+    struct _CONTEXT*,
+    struct _EXCEPTION_REGISTRATION_RECORD**);
+

 typedef struct _EXCEPTION_REGISTRATION_RECORD EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD;
 
 struct _EXCEPTION_REGISTRATION_RECORD
 typedef struct _EXCEPTION_REGISTRATION_RECORD EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD;
 
 struct _EXCEPTION_REGISTRATION_RECORD

diff --git a/reactos/include/reactos/wine/test.h b/reactos/include/reactos/wine/test.h
index fae1487..e0253f7 100644 (file)
--- a/reactos/include/reactos/wine/test.h
+++ b/reactos/include/reactos/wine/test.h
@@ -68,7 +68,7 @@ extern LONG winetest_get_failures(void);
 extern void winetest_add_failures( LONG new_failures );
 extern void winetest_wait_child_process( HANDLE process );
 
 extern void winetest_add_failures( LONG new_failures );
 extern void winetest_wait_child_process( HANDLE process );
 

-extern const char *wine_dbgstr_wn( const WCHAR *str, int n );
+extern const char *wine_dbgstr_wn( const WCHAR *str, intptr_t n );

 extern const char *wine_dbgstr_guid( const GUID *guid );
 static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); }
 
 extern const char *wine_dbgstr_guid( const GUID *guid );
 static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); }
 


@@ -486,7 +486,7 @@ void winetest_wait_child_process( HANDLE process )
     }
 }
 
     }
 }
 

-const char *wine_dbgstr_wn( const WCHAR *str, int n )
+const char *wine_dbgstr_wn( const WCHAR *str, intptr_t n )

 {
     char *dst, *res;
     size_t size;
 {
     char *dst, *res;
     size_t size;