Misc. fixes for compiler warnings.
This commit is contained in:
parent
89aa86165f
commit
1758f2d81a
|
@ -1451,7 +1451,7 @@ DEBUG_RegisterDebugInfo( HMODULE hModule, const char *module_name)
|
|||
* can make 'info shared' types of displays possible.
|
||||
*/
|
||||
int
|
||||
DEBUG_RegisterELFDebugInfo(int load_addr, u_long size, char * name)
|
||||
DEBUG_RegisterELFDebugInfo(int load_addr, u_long size, const char * name)
|
||||
{
|
||||
struct deferred_debug_info * deefer;
|
||||
|
||||
|
|
|
@ -1177,7 +1177,7 @@ DEBUG_ProcessElfSymtab(char * addr, unsigned int load_offset,
|
|||
|
||||
static
|
||||
int
|
||||
DEBUG_ProcessElfObject(char * filename, unsigned int load_offset)
|
||||
DEBUG_ProcessElfObject(const char * filename, unsigned int load_offset)
|
||||
{
|
||||
int rtn = FALSE;
|
||||
struct stat statbuf;
|
||||
|
|
|
@ -93,12 +93,14 @@ INT WINAPI LBItemFromPt (HWND hwndLB, POINT pt, BOOL bAutoScroll)
|
|||
}
|
||||
|
||||
|
||||
#if 0
|
||||
static LRESULT CALLBACK
|
||||
DRAGLIST_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -4685,7 +4685,7 @@ static HRESULT WINAPI Xlib_IDirectDraw2Impl_EnumDisplayModes(
|
|||
XVisualInfo *vi;
|
||||
XPixmapFormatValues *pf;
|
||||
XVisualInfo vt;
|
||||
int xbpp, nvisuals, npixmap, i, emu;
|
||||
int xbpp = 1, nvisuals, npixmap, i, emu;
|
||||
int has_mode[] = { 0, 0, 0, 0 };
|
||||
int has_depth[] = { 8, 15, 16, 24 };
|
||||
DDSURFACEDESC ddsfd;
|
||||
|
|
|
@ -283,7 +283,7 @@ extern int DEBUG_ParseStabs(char * addr, unsigned int load_offset, unsigned int
|
|||
/* debugger/msc.c */
|
||||
extern int DEBUG_RegisterDebugInfo( HMODULE, const char *);
|
||||
extern int DEBUG_ProcessDeferredDebug(void);
|
||||
extern int DEBUG_RegisterELFDebugInfo(int load_addr, u_long size, char * name);
|
||||
extern int DEBUG_RegisterELFDebugInfo(int load_addr, u_long size, const char * name);
|
||||
extern void DEBUG_InfoShare(void);
|
||||
extern void DEBUG_InitCVDataTypes(void);
|
||||
|
||||
|
|
|
@ -2374,7 +2374,7 @@ BOOL WINAPI GetCommTimeouts(HANDLE hcom,LPCOMMTIMEOUTS lptimeouts)
|
|||
* SetCommTimeouts (KERNEL32.453)
|
||||
*/
|
||||
BOOL WINAPI SetCommTimeouts(HANDLE hcom,LPCOMMTIMEOUTS lptimeouts) {
|
||||
struct DosDeviceStruct *ptr;
|
||||
/* struct DosDeviceStruct *ptr; */
|
||||
struct termios tios;
|
||||
int fd;
|
||||
|
||||
|
|
|
@ -3193,7 +3193,7 @@ INT WINAPI GetNumberFormatA(LCID locale, DWORD dwflags,
|
|||
UINT thisnegativeorder;
|
||||
|
||||
|
||||
LPSTR sptr;
|
||||
LPCSTR sptr;
|
||||
LPSTR dptr;
|
||||
char roundbuffer[24]; /* Should be enough */
|
||||
char *gptr;
|
||||
|
@ -3334,28 +3334,28 @@ INT WINAPI GetNumberFormatA(LCID locale, DWORD dwflags,
|
|||
*/
|
||||
|
||||
if (decsize>0 && decsize>thisnumdigits) {
|
||||
sptr-=(decsize-thisnumdigits);
|
||||
|
||||
if (*sptr>='5') {
|
||||
strcpy(roundbuffer+1,lpValue);
|
||||
if (negflag) {
|
||||
*roundbuffer='-';
|
||||
*(roundbuffer+1)='0';
|
||||
} else
|
||||
*roundbuffer='0';
|
||||
sptr=roundbuffer+(sptr-lpValue); // +1-1
|
||||
|
||||
while ( (++*sptr) > '9') {
|
||||
*(sptr--)='0';
|
||||
if (*sptr=='.') sptr--;
|
||||
}
|
||||
if ((negflag ? *(roundbuffer+leadingzeros+1) : *(roundbuffer+leadingzeros)) == '1')
|
||||
intsize++;
|
||||
sptr=roundbuffer;
|
||||
} else
|
||||
sptr=lpValue;
|
||||
} else
|
||||
sptr=lpValue;
|
||||
sptr-=(decsize-thisnumdigits);
|
||||
|
||||
if (*sptr>='5') {
|
||||
strcpy(roundbuffer+1,lpValue);
|
||||
if (negflag) {
|
||||
*roundbuffer='-';
|
||||
*(roundbuffer+1)='0';
|
||||
} else
|
||||
*roundbuffer='0';
|
||||
dptr=roundbuffer+(sptr-lpValue); // +1-1
|
||||
|
||||
while ( (++*dptr) > '9') {
|
||||
*(dptr--)='0';
|
||||
if (*dptr=='.') dptr--;
|
||||
}
|
||||
if ((negflag ? *(roundbuffer+leadingzeros+1) : *(roundbuffer+leadingzeros)) == '1')
|
||||
intsize++;
|
||||
sptr=roundbuffer;
|
||||
} else
|
||||
sptr=lpValue;
|
||||
} else
|
||||
sptr=lpValue;
|
||||
|
||||
totalsize=intsize;
|
||||
|
||||
|
|
|
@ -10,6 +10,8 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "winuser.h"
|
||||
#include "winnt.h"
|
||||
#include "heap.h"
|
||||
#include "builtin32.h"
|
||||
|
|
|
@ -753,10 +753,12 @@ static void ParseTopLevel(void)
|
|||
}
|
||||
|
||||
if (!DLLFileName[0])
|
||||
{
|
||||
if (SpecMode == SPEC_MODE_DLL)
|
||||
sprintf( DLLFileName, "%s.DLL", DLLName );
|
||||
else
|
||||
sprintf( DLLFileName, "%s.EXE", DLLName );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@ MONITOR MONITOR_PrimaryMonitor;
|
|||
/***********************************************************************
|
||||
* MONITOR_GetMonitor
|
||||
*/
|
||||
#if 0
|
||||
static MONITOR *MONITOR_GetMonitor(HMONITOR hMonitor)
|
||||
{
|
||||
if(hMonitor == xPRIMARY_MONITOR)
|
||||
|
@ -34,6 +35,7 @@ static MONITOR *MONITOR_GetMonitor(HMONITOR hMonitor)
|
|||
return NULL;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/***********************************************************************
|
||||
* MONITOR_Initialize
|
||||
|
|
|
@ -114,7 +114,7 @@ static void X11DRV_MONITOR_CreateDesktop(MONITOR *pMonitor)
|
|||
wm_hints->flags = InputHint | StateHint;
|
||||
wm_hints->input = True;
|
||||
wm_hints->initial_state = NormalState;
|
||||
class_hints->res_name = argv0;
|
||||
class_hints->res_name = (char *)argv0;
|
||||
class_hints->res_class = "Wine";
|
||||
|
||||
TSXStringListToTextProperty( &name, 1, &window_name );
|
||||
|
|
Loading…
Reference in New Issue