From e5efc5a657a2a1e9a9cb4fb518c473cdb86ee553 Mon Sep 17 00:00:00 2001
From: Mike McCormack <mike@codeweavers.com>
Date: Tue, 16 Aug 2005 16:02:45 +0000
Subject: [PATCH] gcc 4.0 warning fixes.

---
 dlls/x11drv/event.c    | 7 ++++---
 dlls/x11drv/keyboard.c | 2 +-
 dlls/x11drv/mouse.c    | 2 +-
 dlls/x11drv/opengl.c   | 2 +-
 dlls/x11drv/xrender.c  | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dlls/x11drv/event.c b/dlls/x11drv/event.c
index 6416d467740..8e87daec52d 100644
--- a/dlls/x11drv/event.c
+++ b/dlls/x11drv/event.c
@@ -778,6 +778,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event )
     Atom	atom_aux;
     int         i;
     Window      w_aux;
+    unsigned int u;
   }		u; /* unused */
 
   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 */
     /* calculate length */
-    p = p_data;
+    p = (char*) p_data;
     next = strchr(p, '\n');
     while (p) {
       if (next) *next=0;
@@ -814,7 +815,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event )
     if( drop_len && drop_len < 65535 ) {
       wine_tsx11_lock();
       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();
 
       drop_len += sizeof(DROPFILES) + 1;
@@ -838,7 +839,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event )
 
       /* create message content */
       if (p_drop) {
-	p = p_data;
+	p = (char*) p_data;
 	next = strchr(p, '\n');
 	while (p) {
 	  if (next) *next=0;
diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c
index ff37a7e080f..48ab7f62cd4 100644
--- a/dlls/x11drv/keyboard.c
+++ b/dlls/x11drv/keyboard.c
@@ -2376,7 +2376,7 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
 
     if (ret == 0)
     {
-	BYTE dead_char;
+	char dead_char;
 
 #ifdef XK_EuroSign
         /* An ugly hack for EuroSign: X can't translate it to a character
diff --git a/dlls/x11drv/mouse.c b/dlls/x11drv/mouse.c
index 3379ee94250..d84f91bd733 100644
--- a/dlls/x11drv/mouse.c
+++ b/dlls/x11drv/mouse.c
@@ -453,7 +453,7 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr )
                 return 0;
             }
             /* 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
              * should immediately follow the mask.
              */
diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c
index 1fa2ebb5fc4..a64861e305e 100644
--- a/dlls/x11drv/opengl.c
+++ b/dlls/x11drv/opengl.c
@@ -100,7 +100,7 @@ static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) {
   switch (ppfd->iLayerType) {
   case PFD_MAIN_PLANE: DPRINTF("PFD_MAIN_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");
 }
diff --git a/dlls/x11drv/xrender.c b/dlls/x11drv/xrender.c
index b7f1bceebb0..1220722a11e 100644
--- a/dlls/x11drv/xrender.c
+++ b/dlls/x11drv/xrender.c
@@ -1698,7 +1698,7 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst,
 
     wine_tsx11_lock();
     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);
 
-- 
2.11.4.GIT