gcc 4.0 warning fixes.
This commit is contained in:
parent
6fb12fc291
commit
e5efc5a657
|
@ -778,6 +778,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event )
|
||||||
Atom atom_aux;
|
Atom atom_aux;
|
||||||
int i;
|
int i;
|
||||||
Window w_aux;
|
Window w_aux;
|
||||||
|
unsigned int u;
|
||||||
} u; /* unused */
|
} u; /* unused */
|
||||||
|
|
||||||
if (!(GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES)) return;
|
if (!(GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES)) return;
|
||||||
|
@ -794,7 +795,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event )
|
||||||
|
|
||||||
if( !aux_long && p_data) { /* don't bother if > 64K */
|
if( !aux_long && p_data) { /* don't bother if > 64K */
|
||||||
/* calculate length */
|
/* calculate length */
|
||||||
p = p_data;
|
p = (char*) p_data;
|
||||||
next = strchr(p, '\n');
|
next = strchr(p, '\n');
|
||||||
while (p) {
|
while (p) {
|
||||||
if (next) *next=0;
|
if (next) *next=0;
|
||||||
|
@ -814,7 +815,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event )
|
||||||
if( drop_len && drop_len < 65535 ) {
|
if( drop_len && drop_len < 65535 ) {
|
||||||
wine_tsx11_lock();
|
wine_tsx11_lock();
|
||||||
XQueryPointer( event->display, root_window, &u.w_aux, &u.w_aux,
|
XQueryPointer( event->display, root_window, &u.w_aux, &u.w_aux,
|
||||||
&x, &y, &u.i, &u.i, &u.i);
|
&x, &y, &u.i, &u.i, &u.u);
|
||||||
wine_tsx11_unlock();
|
wine_tsx11_unlock();
|
||||||
|
|
||||||
drop_len += sizeof(DROPFILES) + 1;
|
drop_len += sizeof(DROPFILES) + 1;
|
||||||
|
@ -838,7 +839,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event )
|
||||||
|
|
||||||
/* create message content */
|
/* create message content */
|
||||||
if (p_drop) {
|
if (p_drop) {
|
||||||
p = p_data;
|
p = (char*) p_data;
|
||||||
next = strchr(p, '\n');
|
next = strchr(p, '\n');
|
||||||
while (p) {
|
while (p) {
|
||||||
if (next) *next=0;
|
if (next) *next=0;
|
||||||
|
|
|
@ -2376,7 +2376,7 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
|
||||||
|
|
||||||
if (ret == 0)
|
if (ret == 0)
|
||||||
{
|
{
|
||||||
BYTE dead_char;
|
char dead_char;
|
||||||
|
|
||||||
#ifdef XK_EuroSign
|
#ifdef XK_EuroSign
|
||||||
/* An ugly hack for EuroSign: X can't translate it to a character
|
/* An ugly hack for EuroSign: X can't translate it to a character
|
||||||
|
|
|
@ -453,7 +453,7 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr )
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
/* The location of the mask. */
|
/* The location of the mask. */
|
||||||
theMask = (char *)(ptr + 1);
|
theMask = (unsigned char *)(ptr + 1);
|
||||||
/* The mask should still be 1 bit per pixel. The color image
|
/* The mask should still be 1 bit per pixel. The color image
|
||||||
* should immediately follow the mask.
|
* should immediately follow the mask.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -100,7 +100,7 @@ static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) {
|
||||||
switch (ppfd->iLayerType) {
|
switch (ppfd->iLayerType) {
|
||||||
case PFD_MAIN_PLANE: DPRINTF("PFD_MAIN_PLANE"); break;
|
case PFD_MAIN_PLANE: DPRINTF("PFD_MAIN_PLANE"); break;
|
||||||
case PFD_OVERLAY_PLANE: DPRINTF("PFD_OVERLAY_PLANE"); break;
|
case PFD_OVERLAY_PLANE: DPRINTF("PFD_OVERLAY_PLANE"); break;
|
||||||
case PFD_UNDERLAY_PLANE: DPRINTF("PFD_UNDERLAY_PLANE"); break;
|
case (BYTE)PFD_UNDERLAY_PLANE: DPRINTF("PFD_UNDERLAY_PLANE"); break;
|
||||||
}
|
}
|
||||||
DPRINTF("\n");
|
DPRINTF("\n");
|
||||||
}
|
}
|
||||||
|
|
|
@ -1698,7 +1698,7 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst,
|
||||||
|
|
||||||
wine_tsx11_lock();
|
wine_tsx11_lock();
|
||||||
image = XCreateImage(gdi_display, visual, 32, ZPixmap, 0,
|
image = XCreateImage(gdi_display, visual, 32, ZPixmap, 0,
|
||||||
data, widthSrc, heightSrc, 32, widthSrc * 4);
|
(char*) data, widthSrc, heightSrc, 32, widthSrc * 4);
|
||||||
|
|
||||||
src_format = pXRenderFindStandardFormat(gdi_display, PictStandardARGB32);
|
src_format = pXRenderFindStandardFormat(gdi_display, PictStandardARGB32);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue