From 45edb2fcb3a0f50fd8dd7c2b807a2d9c1a0e7271 Mon Sep 17 00:00:00 2001 From: James Abbatiello Date: Mon, 12 Feb 2001 03:42:58 +0000 Subject: [PATCH] Fix a few compiler warnings. --- dlls/dinput/joystick/linuxinput.c | 2 +- include/callback.h | 2 +- windows/winproc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick/linuxinput.c b/dlls/dinput/joystick/linuxinput.c index 78373e75175..b8be708acba 100644 --- a/dlls/dinput/joystick/linuxinput.c +++ b/dlls/dinput/joystick/linuxinput.c @@ -831,7 +831,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE2A iface, } 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 */ diff --git a/include/callback.h b/include/callback.h index 9a4601db170..5be74d00011 100644 --- a/include/callback.h +++ b/include/callback.h @@ -84,7 +84,7 @@ typedef struct tagTHUNK 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)); \ diff --git a/windows/winproc.c b/windows/winproc.c index 2a9176404ac..225d42f4fab 100644 --- a/windows/winproc.c +++ b/windows/winproc.c @@ -326,7 +326,7 @@ static WINDOWPROC *WINPROC_AllocWinProc( WNDPROC16 func, WINDOWPROCTYPE type, 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) ? -- 2.11.4.GIT