Warning fixes

James Abbatiello abbeyj at WPI.EDU
Wed Feb 7 09:18:28 CST 2001


Changelog:
	James Abbatiello <jabbey at codeweavers.com>
	Fix a few compiler warnings

-- 
James Abbatiello

-------------- next part --------------
Index: dlls/dinput/joystick/linuxinput.c
===================================================================
RCS file: /home/wine/wine/dlls/dinput/joystick/linuxinput.c,v
retrieving revision 1.5
diff -u -r1.5 linuxinput.c
--- dlls/dinput/joystick/linuxinput.c	2001/01/28 23:14:25	1.5
+++ dlls/dinput/joystick/linuxinput.c	2001/02/07 15:04:03
@@ -831,7 +831,7 @@
     }
 
     case (DWORD) DIPROP_RANGE: {
-      LPDIPROPRANGE pr = (LPDIPROPRANGE) pdiph;
+      /* LPDIPROPRANGE pr = (LPDIPROPRANGE) pdiph; */
       if ((pdiph->dwHow == DIPH_BYID) &&
 	  (pdiph->dwObj & DIDFT_ABSAXIS)) {
 	/* The app is querying the current range of the axis : return the lMin and lMax values */
Index: include/callback.h
===================================================================
RCS file: /home/wine/wine/include/callback.h,v
retrieving revision 1.39
diff -u -r1.39 callback.h
--- include/callback.h	2001/01/15 22:30:51	1.39
+++ include/callback.h	2001/02/07 15:04:03
@@ -84,7 +84,7 @@
     THUNK aname; \
     aname.popl_eax = 0x58; \
     aname.pushl_func = 0x68; \
-    aname.proc = (FARPROC) (aproc); \
+    aname.proc = (FARPROC16) (aproc); \
     aname.pushl_eax = 0x50; \
     aname.jmp = 0xe9; \
     aname.relay = (RELAY)((char *)(arelay) - (char *)(&(aname).next)); \
Index: windows/winproc.c
===================================================================
RCS file: /home/wine/wine/windows/winproc.c,v
retrieving revision 1.62
diff -u -r1.62 winproc.c
--- windows/winproc.c	2001/01/26 20:40:51	1.62
+++ windows/winproc.c	2001/02/07 15:04:03
@@ -326,7 +326,7 @@
         case WIN_PROC_32W:
             proc->thunk.t_from16.pushw_bp    = 0x5566; /* pushw %bp */
             proc->thunk.t_from16.pushl_func  = 0x68;   /* pushl $proc */
-            proc->thunk.t_from16.proc        = (FARPROC)func;
+            proc->thunk.t_from16.proc        = (WNDPROC)func;
             proc->thunk.t_from16.pushw_ax    = 0x5066; /* pushw %ax */
             proc->thunk.t_from16.pushl_relay = 0x68;   /* pushl $relay */
             proc->thunk.t_from16.relay       = (type == WIN_PROC_32A) ?


More information about the wine-patches mailing list