From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 31 May 2014 15:44:45 +0000 (+0000)
Subject: [WINE]
X-Git-Tag: backups/0.3.17@66124~1070
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=461f47c1d1fbeae5c4f4262c62145ee423603a8b;ds=sidebyside

[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 611316b50e0..5a5e7f7e9dd 100644
--- 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
-typedef EXCEPTION_DISPOSITION (*PEXCEPTION_HANDLER)
-		(struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*);
-
 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
diff --git a/reactos/include/reactos/wine/test.h b/reactos/include/reactos/wine/test.h
index fae1487bbd1..e0253f7ced3 100644
--- 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 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 ); }
 
@@ -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;