[Mplayer-cvslog] CVS: main/Gui/wm ws.c,1.55,1.56

Jürgen Keil jkeil at mplayerhq.hu
Sat Oct 19 21:47:19 CEST 2002


Update of /cvsroot/mplayer/main/Gui/wm
In directory mail:/var/tmp.root/cvs-serv19825

Modified Files:
	ws.c 
Log Message:
- wsErrorHandler was crashing on solaris with a null pointer access in printf;
don't crash when current_module is not set.

- CWX, CWY, CWWidth, CWHeight are invalid attributes for CreateWindow, they
should be used with ConfigureWindow only.  (Note: their definition is
equivalent to CWBackPixmap, CWBackPixel, CWBorderPixmap, CWBorderPixel)


Index: ws.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ws.c	16 Oct 2002 15:35:28 -0000	1.55
+++ ws.c	19 Oct 2002 19:47:16 -0000	1.56
@@ -161,7 +161,7 @@
  fprintf(stderr,"[ws]  Error code: %d ( %s )\n",Event->error_code,type );
  fprintf(stderr,"[ws]  Request code: %d\n",Event->request_code );
  fprintf(stderr,"[ws]  Minor code: %d\n",Event->minor_code );
- fprintf(stderr,"[ws]  Modules: %s\n",current_module );
+ fprintf(stderr,"[ws]  Modules: %s\n",current_module?current_module:"(NULL)" );
  exit( 0 );
 }
 
@@ -436,7 +436,6 @@
 
  win->WindowMask=CWBackPixel | CWBorderPixel |
                  CWColormap | CWEventMask | CWCursor |
-                 CWX | CWY | CWWidth | CWHeight |
                  CWOverrideRedirect;
 
  win->WindowID=XCreateWindow( wsDisplay,




More information about the MPlayer-cvslog mailing list