diff -uNr xawdecode/alevt/ui.c xawdecode-new/alevt/ui.c

--- xawdecode/alevt/ui.c	2005-08-12 11:35:41 +0400

+++ xawdecode-new/alevt/ui.c	2007-06-05 23:59:57 +0400

@@ -66,7 +66,7 @@

 static void

 set_title(struct vtwin *w)

 {

-    char buf[32], buf2[32];

+    char buf[sizeof(wchar_t)*32], buf2[sizeof(wchar_t)*32];

     if (w->subno == ANY_SUB)

 	sprintf(buf, "%x", w->pgno);

diff -uNr xawdecode/src/alevtparams_ui.c xawdecode-new/src/alevtparams_ui.c

--- xawdecode/src/alevtparams_ui.c	2007-06-06 01:00:25 +0400

+++ xawdecode-new/src/alevtparams_ui.c	2007-06-06 00:24:53 +0400

@@ -203,7 +203,7 @@

 {

   long cd = (long) clientdata;

   int j;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   char *tok;

   Cardinal argc;

@@ -297,7 +297,7 @@

 create_alevtparamswin()

 {

   Widget c;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

 #ifdef HAVE_XPM

   Pixmap icon_pixmap;

   Pixmap icon_shapemask;

diff -uNr xawdecode/src/conf.c xawdecode-new/src/conf.c

--- xawdecode/src/conf.c	2007-06-06 01:00:25 +0400

+++ xawdecode-new/src/conf.c	2007-06-06 00:10:37 +0400

@@ -95,7 +95,7 @@

 extern Atom wm_protocols[2];

 extern int tv_debug;

 extern void ExitCB();

-extern char title[256];

+extern char title[sizeof(wchar_t)*256];

 extern int count;

 // For the Xosd messages

diff -uNr xawdecode/src/devicemanager/devicemanager_ui.c xawdecode-new/src/devicemanager/devicemanager_ui.c

--- xawdecode/src/devicemanager/devicemanager_ui.c	2007-06-06 01:00:25 +0400

+++ xawdecode-new/src/devicemanager/devicemanager_ui.c	2007-06-06 00:25:04 +0400

@@ -173,7 +173,7 @@

 {

   long cd = (long) clientdata;

   int j;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   switch (cd)

     {

@@ -370,7 +370,7 @@

 void

 create_devicemanagerwin()

 {

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   devman_initialize_menus();

   translate_struct(api_list);

diff -uNr xawdecode/src/divx_advanced_ui.c xawdecode-new/src/divx_advanced_ui.c

--- xawdecode/src/divx_advanced_ui.c	2007-06-06 01:00:25 +0400

+++ xawdecode-new/src/divx_advanced_ui.c	2007-06-06 00:24:38 +0400

@@ -318,7 +318,7 @@

 void update_divxa_commandwidget(Widget widget,int value, char *text)

 {

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   sprintf (label, "%-*s: %5d", ALI(LAB_WIDTH5, text), value);

   if (widget)

     XtVaSetValues (widget, XtNlabel, label, NULL);

@@ -432,7 +432,7 @@

 {

   int cd = (int) clientdata;

   int j;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   switch (cd)

     {

@@ -838,7 +838,7 @@

   char *name;

   int value = 0;

   float data;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   data = *(float *) call_data;

   name = XtName (XtParent (widget));

@@ -1259,7 +1259,7 @@

 create_xvid_win()

 {

   Widget c, p;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

 #ifdef HAVE_XPM

   Pixmap icon_pixmap;

@@ -1675,7 +1675,7 @@

 create_ffmpeg_win()

 {

   Widget c, p;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

 #ifdef HAVE_XPM

   Pixmap icon_pixmap;

diff -uNr xawdecode/src/divx.c xawdecode-new/src/divx.c

--- xawdecode/src/divx.c	2007-06-06 01:00:25 +0400

+++ xawdecode-new/src/divx.c	2007-06-06 00:45:37 +0400

@@ -74,7 +74,7 @@

 extern int grabber;

 extern void file_wait_write_audio(void);

 extern int fs, force_recfile;

-extern char channel_title[256];

+extern char channel_title[sizeof(wchar_t)*256];

 extern int cur_input;

 #undef  NOAUDIO

@@ -394,9 +394,9 @@

 extern int tv_debug;

-char xawmessage [1024];

-char xawmesstmp [256];

-char lastfilename[256] = {'\0'};

+char xawmessage [sizeof(wchar_t)*1024];

+char xawmesstmp [sizeof(wchar_t)*256];

+char lastfilename[sizeof(wchar_t)*256] = {'\0'};

 char *pplayer = "mplayer -nofs -quiet -nosound ";

 extern int xawpopup;

diff -uNr xawdecode/src/divx.h xawdecode-new/src/divx.h

--- xawdecode/src/divx.h	2007-05-01 21:59:00 +0400

+++ xawdecode-new/src/divx.h	2007-06-06 00:58:42 +0400

@@ -60,7 +60,7 @@

 void divx_restart(void);

 char* get_filename(void);

-char lastfilename[256];

+//char lastfilename[sizeof(wchar_t)*256];

 char *pplayer;

 unsigned long dropped_audio_buffers, dropped_video_frames,video_frames, audio_buffers;

diff -uNr xawdecode/src/divx_ui.c xawdecode-new/src/divx_ui.c

--- xawdecode/src/divx_ui.c	2007-06-06 01:00:25 +0400

+++ xawdecode-new/src/divx_ui.c	2007-06-06 00:24:20 +0400

@@ -370,7 +370,7 @@

 void update_divx_scrollbarwidget(Widget widgeta,Widget widgetb,int value, int range, char *text)

 {

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   if (widgetb)

     set_float (widgetb, XtNtopOfThumb, (float)value/range);

   sprintf (label, "%-*s: %5d", ALI(LAB_WIDTH3, text), value);

@@ -641,7 +641,7 @@

 {

   int cd = (int) clientdata;

   int j;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   int value;

   char *tok;

   size_t argc;

@@ -975,7 +975,7 @@

   char *name;

   int value = 0;

   float data;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   data = *(float *) call_data;

   name = XtName (XtParent (widget));

@@ -1319,7 +1319,7 @@

 create_divxwin(void)

 {

   Widget c,p;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   translate_struct(on_off_list);

 #ifdef HAVE_DIVX4LINUX

@@ -1663,7 +1663,7 @@

 create_divxaudiowin(void)

 {

   Widget c,p;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

 #ifdef HAVE_XPM  

   Pixmap icon_pixmap;

   Pixmap icon_shapemask;

@@ -1955,7 +1955,7 @@

 create_streamparamswin()

 {

   Widget c;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

 #ifdef HAVE_XPM  

   Pixmap icon_pixmap;

   Pixmap icon_shapemask;

@@ -2070,7 +2070,7 @@

 }

 void update_vcodec(int j){

-	  char label[64];

+	  char label[sizeof(wchar_t)*64];

           divx.codec = j;

 	  if (!label) return;

           sprintf (label, "%-*s:       %s", ALI(LAB_WIDTH3, "Codec"),

@@ -2141,7 +2141,7 @@

 }

 void update_acodec(int j){

-	char label[64];

+	char label[sizeof(wchar_t)*64];

           divx.audio_codec = j;

           sprintf (label, "%-*s:       %s", ALI(LAB_WIDTH3, translate("Audio Codec")),

                    int_to_str (divx.audio_codec, audio_codec_list_t));

diff -uNr xawdecode/src/dvb_init_ui.c xawdecode-new/src/dvb_init_ui.c

--- xawdecode/src/dvb_init_ui.c	2007-06-06 01:00:25 +0400

+++ xawdecode-new/src/dvb_init_ui.c	2007-06-06 00:23:41 +0400

@@ -276,7 +276,7 @@

 {

   int cd = (int) clientdata;

   int j;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   switch (cd)

     {

@@ -463,7 +463,7 @@

 create_dvbinitwin()

 {

   Widget c;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

 #ifdef HAVE_XPM

   Pixmap icon_pixmap;

   Pixmap icon_shapemask;

diff -uNr xawdecode/src/grab-dvb.c xawdecode-new/src/grab-dvb.c

--- xawdecode/src/grab-dvb.c	2007-06-06 01:00:25 +0400

+++ xawdecode-new/src/grab-dvb.c	2007-06-06 00:09:38 +0400

@@ -167,7 +167,7 @@

 #define MAX_VIDEOQ_SIZE (5 * 256 * 1024)

 #define MAX_AUDIOQ_SIZE (5 * 16 * 1024)

-#define MAX_SUBTITLEQ_SIZE (5 * 16 * 1024)

+#define MAX_SUBTITLEQ_SIZE sizeof(wchar_t)*(5 * 16 * 1024)

 /* SDL audio buffer size, in samples. Should be small to have precise

    A/V sync as SDL does not have hardware buffer fullness info. */

diff -uNr xawdecode/src/grab_ui.c xawdecode-new/src/grab_ui.c

--- xawdecode/src/grab_ui.c	2007-06-06 01:00:25 +0400

+++ xawdecode-new/src/grab_ui.c	2007-06-06 00:23:37 +0400

@@ -157,7 +157,7 @@

   char *name;

   int value = 0;

   float data;  

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   data = *(float *) call_data;

   name = XtName (XtParent (widget));

@@ -258,7 +258,7 @@

 create_grabwin()

 {

   Widget c,p;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   grab_shell = XtVaAppCreateShell ("Grab", "XdTV",

                                    topLevelShellWidgetClass,

diff -uNr xawdecode/src/init_labels.c xawdecode-new/src/init_labels.c

--- xawdecode/src/init_labels.c	2007-04-30 21:25:12 +0400

+++ xawdecode-new/src/init_labels.c	2007-06-05 23:45:10 +0400

@@ -47,9 +47,9 @@

 init_windows_labels(void)

 {

 	XrmDatabase rb;

-	char help_title[50];

-	char app_title[50];

-	char temp[50];

+	char help_title[sizeof(wchar_t)*50];

+	char app_title[sizeof(wchar_t)*50];

+	char temp[sizeof(wchar_t)*50];

 	char *help_message;

 	if (app_shell==NULL)

diff -uNr xawdecode/src/subtitles_ui.c xawdecode-new/src/subtitles_ui.c

--- xawdecode/src/subtitles_ui.c	2007-06-06 01:00:25 +0400

+++ xawdecode-new/src/subtitles_ui.c	2007-06-06 00:08:25 +0400

@@ -63,7 +63,7 @@

 extern Display *dpy;

 extern Atom wm_protocols[2];

 extern int tv_debug;

-extern char title[256];

+extern char title[sizeof(wchar_t)*256];

 extern int subactive;

 extern int xawpopup;

 extern int set_subpage(char *name);

diff -uNr xawdecode/src/x11params_ui.c xawdecode-new/src/x11params_ui.c

--- xawdecode/src/x11params_ui.c	2007-06-06 01:00:25 +0400

+++ xawdecode-new/src/x11params_ui.c	2007-06-06 00:22:45 +0400

@@ -90,7 +90,7 @@

 extern int fs_width, fs_height;

 extern int fs_xoff, fs_yoff;

 extern int pix_width, pix_height;

-extern char title[256];

+extern char title[sizeof(wchar_t)*256];

 static Widget x11params_shell; 

        Widget x11params_paned;

@@ -213,7 +213,7 @@

 {

   long cd = (long) clientdata;

   int j;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   switch (cd)

     {

@@ -317,7 +317,7 @@

 {

   char *name;

   float value;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   value = *(float *) call_data;

   name = XtName (XtParent (widget));

@@ -420,7 +420,7 @@

 void

 set_capture_size (int width, int height)

 {

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   if (s_capt_width)

     set_float(s_capt_width, XtNtopOfThumb, (float) (width - CAPT_WIDTH_MIN)/

@@ -474,7 +474,7 @@

 void update_blackborder(void)

 {

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   static int oldy= -1 ;

   int y = get_ybar_ratio();

@@ -565,7 +565,7 @@

 create_x11paramswin()

 {

   Widget c,p;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

 #ifdef HAVE_XPM  

   Pixmap icon_pixmap;

   Pixmap icon_shapemask;

diff -uNr xawdecode/src/xosdparams_ui.c xawdecode-new/src/xosdparams_ui.c

--- xawdecode/src/xosdparams_ui.c	2007-06-06 01:00:25 +0400

+++ xawdecode-new/src/xosdparams_ui.c	2007-06-06 00:23:17 +0400

@@ -353,7 +353,7 @@

 {

   long cd = (long) clientdata;

   int j;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   if (!font)

     font = strdup("-*-ledfixed-*-*-*-*-*-*-*-*-*-*-*-*");

   if (!font_vtx)

@@ -463,7 +463,7 @@

   char *name;

   int value = 0;

   float data;  

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   data = *(float *) call_data;

   name = XtName (XtParent (widget));

@@ -622,7 +622,7 @@

 create_xosdparamswin()

 {

   Widget c, p;

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   translate_struct(text_color_name_list);

   translate_struct(outline_color_name_list);

diff -uNr xawdecode/src/main.c xawdecode-new/src/main.c

--- xawdecode/src/main.c	2007-06-06 01:00:25 +0400

+++ xawdecode-new/src/main.c	2007-06-05 22:52:57 +0400

@@ -191,7 +191,7 @@

 //#endif <== xosd inside now

 int message_timer = 3000;

-extern char lastfilename[256];

+extern char lastfilename[sizeof(wchar_t)*256];

 #ifdef HAVE_LIBJPEG

 int jpegpcent = 75;

@@ -356,9 +356,9 @@

 /*--- channels ------------------------------------------------------------*/

 struct STRTAB *cmenu = NULL;

-char title[512];

-char title2[256];

-char channel_title[256] = {'\0'};

+char title[sizeof(wchar_t)*512];

+char title2[sizeof(wchar_t)*256];

+char channel_title[sizeof(wchar_t)*256] = {'\0'};

 int cur_color;

 int cur_bright;

@@ -1119,7 +1119,7 @@

 Dimension x, y;

 Dimension w, h;

-char value[20];

+char value[sizeof(wchar_t)*20];

   XtVaGetValues (app_shell, XtNx, &x, XtNy, &y,

                 XtNwidth, &w, XtNheight, &h, NULL);

@@ -1249,7 +1249,7 @@

 set_property (int freq, char *channel, char *name)

 {

   int len;

-  char line[80];

+  char line[sizeof(wchar_t)*80];

   len = sprintf (line, "%.3f", (float) freq / 16) + 1;

   len += sprintf (line + len, "%s", channel) + 1;

@@ -1505,7 +1505,7 @@

 void

 set_picparams (int color, int bright, int hue, int contrast)

 {

-  char label [64];

+  char label [sizeof(wchar_t)*64];

   if (color != -1)

     {

@@ -1934,7 +1934,7 @@

         strcat (alevtarg,"-charset latin-2 ");

 	break;

       case 2:

-        strcat (alevtarg,"-charset koi8-r ");

+        strcat (alevtarg,"-charset koi8-r ");

 	break;

       case 3:

         strcat (alevtarg,"-charset iso8859-7 ");

@@ -2177,7 +2177,7 @@

 void

 set_volume ()

 {

-  char label[64];

+  char label[sizeof(wchar_t)*64];

   mixer_set_volume (cur_volume);

   mixer_set_mute (cur_mute);

@@ -2277,7 +2277,7 @@

   void *buffer;

   char *filename = NULL;

   char *snapbase = "snap";

-  char begin_name[256] = {'\0'};

+  char begin_name[sizeof(wchar_t)*256] = {'\0'};

   char *name = NULL;

   Dimension width = cur_maxwidth;

   Dimension height = cur_maxheight;

@@ -2428,7 +2428,7 @@

 void channel_menu(void)

 {

     int  i,max,len;

-    char str[100];

+    char str[sizeof(wchar_t)*100];

     if (cmenu)

 	free(cmenu);

@@ -2765,7 +2765,7 @@

 {

   const int max_length = 10, columns = 4;//set max_length to about 8 for big fonts and ~40 channels

   int i, j, length = 0, rows = 0, current_channel;

-  char tit[max_length];

+  char tit[sizeof(wchar_t)*max_length];

   //init

   title[0] = 0;

@@ -2821,7 +2821,7 @@

 {

   Atom type;

   int format, argc, i;

-  char *argv[32];

+  char *argv[sizeof(wchar_t)*32];

   unsigned long nitems, bytesafter;

   unsigned char *args = NULL;

@@ -3641,7 +3641,7 @@

 ShowRecordSizeAction (Widget widget, XEvent * event,

               String * params, Cardinal * num_params)

 {

-  char res[256] = {'\0'};

+  char res[sizeof(wchar_t)*256] = {'\0'};

   int ir=0;

   FILE *df;

@@ -4660,7 +4660,7 @@

   int n;

   struct dirent **namelist;

   FILE *fp;

-  char line [128];

+  char line [sizeof(wchar_t)*128];

   char *test_string;

   char **test_device;

@@ -5032,7 +5032,7 @@

 {

   int i, noconf;

   char *arg, *argprec=NULL;

-  char xdtv_v4l_conf[128] = "xdtv_v4l-conf";

+  char xdtv_v4l_conf[sizeof(wchar_t)*128] = "xdtv_v4l-conf";

   char *vop_cmdline=NULL, *aop_cmdline=NULL;

   char *theme_cmdline=NULL; 

   Dimension w;