fixed warnings

svn path=/trunk/; revision=15218

diff --git a/rosapps/dflat32/button.c b/rosapps/dflat32/button.c
index 461d9b9..1e3f962 100644 (file)
--- a/rosapps/dflat32/button.c
+++ b/rosapps/dflat32/button.c
@@ -18,7 +18,7 @@ void PaintMsg(DFWINDOW wnd, DF_CTLWINDOW *ct, DFRECT *rc)
         }
         if (ct->itext != NULL)
                {
-            unsigned char *txt;
+            char *txt;
             txt = DfCalloc(1, strlen(ct->itext)+10);
             if (ct->setting == DF_OFF)    {
                 txt[0] = DF_CHANGECOLOR;

diff --git a/rosapps/dflat32/dflat.h b/rosapps/dflat32/dflat.h
index 2f583bd..6c5d18f 100644 (file)
--- a/rosapps/dflat32/dflat.h
+++ b/rosapps/dflat32/dflat.h
@@ -101,7 +101,7 @@ typedef struct DfWindow
        /* ----------------- text box fields ------------------ */
        int wlines;     /* number of lines of text              */
        int wtop;       /* text line that is on the top display */
-       unsigned char *text; /* window text                     */
+       char *text;     /* window text                     */
        unsigned int textlen;  /* text length                   */
        int wleft;      /* left position in window viewport     */
        int textwidth;  /* width of longest line in textbox     */
@@ -124,7 +124,7 @@ typedef struct DfWindow
        int CurrLine;     /* Current line                       */
        int WndRow;       /* Current window row                 */
        BOOL TextChanged; /* TRUE if text has changed           */
-       unsigned char *DeletedText; /* for undo                 */
+       char *DeletedText;          /* for undo                 */
        unsigned DeletedLength; /* Length of deleted field      */
        BOOL InsertMode;   /* TRUE or FALSE for text insert     */
        BOOL WordWrapMode; /* TRUE or FALSE for word wrap       */
@@ -250,40 +250,40 @@ extern BOOL DfClipString;
 /* --------- space between menubar labels --------- */
 #define DF_MSPACE 2
 /* --------------- border characters ------------- */
-#define DF_FOCUS_NW      (unsigned char) '\xc9'
-#define DF_FOCUS_NE      (unsigned char) '\xbb'
-#define DF_FOCUS_SE      (unsigned char) '\xbc'
-#define DF_FOCUS_SW      (unsigned char) '\xc8'
-#define DF_FOCUS_SIDE    (unsigned char) '\xba'
-#define DF_FOCUS_LINE    (unsigned char) '\xcd'
-#define DF_NW            (unsigned char) '\xda'
-#define DF_NE            (unsigned char) '\xbf'
-#define DF_SE            (unsigned char) '\xd9'
-#define DF_SW            (unsigned char) '\xc0'
-#define DF_SIDE          (unsigned char) '\xb3'
-#define DF_LINE          (unsigned char) '\xc4'
-#define DF_LEDGE         (unsigned char) '\xc3'
-#define DF_REDGE         (unsigned char) '\xb4'
+#define DF_FOCUS_NW      '\xc9'
+#define DF_FOCUS_NE      '\xbb'
+#define DF_FOCUS_SE      '\xbc'
+#define DF_FOCUS_SW      '\xc8'
+#define DF_FOCUS_SIDE    '\xba'
+#define DF_FOCUS_LINE    '\xcd'
+#define DF_NW            '\xda'
+#define DF_NE            '\xbf'
+#define DF_SE            '\xd9'
+#define DF_SW            '\xc0'
+#define DF_SIDE          '\xb3'
+#define DF_LINE          '\xc4'
+#define DF_LEDGE         '\xc3'
+#define DF_REDGE         '\xb4'
 /* ------------- scroll bar characters ------------ */
-#define DF_UPSCROLLBOX    (unsigned char) '\x1e'
-#define DF_DOWNSCROLLBOX  (unsigned char) '\x1f'
-#define DF_LEFTSCROLLBOX  (unsigned char) '\x11'
-#define DF_RIGHTSCROLLBOX (unsigned char) '\x10'
-#define DF_SCROLLBARCHAR  (unsigned char) 176
-#define DF_SCROLLBOXCHAR  (unsigned char) 178
+#define DF_UPSCROLLBOX    '\x1e'
+#define DF_DOWNSCROLLBOX  '\x1f'
+#define DF_LEFTSCROLLBOX  '\x11'
+#define DF_RIGHTSCROLLBOX '\x10'
+#define DF_SCROLLBARCHAR  '\xb0'
+#define DF_SCROLLBOXCHAR  '\xb2'
 /* ------------------ menu characters --------------------- */
-#define DF_CHECKMARK      (unsigned char) '\x04' //(DF_SCREENHEIGHT==25?251:4)
-#define DF_CASCADEPOINTER (unsigned char) '\x10'
+#define DF_CHECKMARK      '\x04' //(DF_SCREENHEIGHT==25?251:4)
+#define DF_CASCADEPOINTER '\x10'
 /* ----------------- title bar characters ----------------- */
-#define DF_CONTROLBOXCHAR (unsigned char) '\xf0'
-#define DF_MAXPOINTER     24      /* maximize token            */
-#define DF_MINPOINTER     25      /* minimize token            */
-#define DF_RESTOREPOINTER 18      /* restore token             */
+#define DF_CONTROLBOXCHAR '\xf0'
+#define DF_MAXPOINTER     '\x18'  /* maximize token            */
+#define DF_MINPOINTER     '\x19'  /* minimize token            */
+#define DF_RESTOREPOINTER '\x12'  /* restore token             */
 /* --------------- text control characters ---------------- */
-#define DF_APPLCHAR     (unsigned char) 176 /* fills application window */
+#define DF_APPLCHAR     '\xb0' /* fills application window */
 #define DF_SHORTCUTCHAR '~'    /* prefix: shortcut key display */
-#define DF_CHANGECOLOR  (unsigned char) 174 /* prefix to change colors  */
-#define DF_RESETCOLOR   (unsigned char) 175 /* reset colors to default  */
+#define DF_CHANGECOLOR  '\xae' /* prefix to change colors  */
+#define DF_RESETCOLOR   '\xaf' /* reset colors to default  */
 #define DF_LISTSELECTOR   4    /* selected list box entry      */
 
 /* --------- message prototypes ----------- */
@@ -376,7 +376,7 @@ void DfCopyToClipboard(DFWINDOW);
 BOOL DfPasteText(DFWINDOW, char *, unsigned);
 void DfClearClipboard(void);
 /* --------- menu prototypes ---------- */
-int DfCopyCommand(unsigned char *, unsigned char *, int, int);
+int DfCopyCommand(char *, char *, int, int);
 void DfPrepFileMenu(void *, struct DfMenu *);
 void DfPrepEditMenu(void *, struct DfMenu *);
 void DfPrepSearchMenu(void *, struct DfMenu *);

diff --git a/rosapps/dflat32/dialbox.c b/rosapps/dflat32/dialbox.c
index 018c13f..90921fe 100644 (file)
--- a/rosapps/dflat32/dialbox.c
+++ b/rosapps/dflat32/dialbox.c
@@ -430,7 +430,7 @@ void DfGetItemText(DFWINDOW wnd, enum DfCommands cmd,
                                 char *text, int len)
 {
     DF_CTLWINDOW *ct = DfFindCommand(wnd->extension, cmd, DF_EDITBOX);
-    unsigned char *cp;
+    char *cp;
 
     if (ct == NULL)
         ct = DfFindCommand(wnd->extension, cmd, DF_COMBOBOX);

diff --git a/rosapps/dflat32/edit.c b/rosapps/dflat32/edit.c
index a323e1e..6b5556d 100644 (file)
--- a/rosapps/dflat32/edit.c
+++ b/rosapps/dflat32/edit.c
@@ -393,7 +393,7 @@ static void PrintPad(DFWINDOW wnd)
                {
                        long percent;
                        BOOL KeepPrinting = TRUE;
-                       unsigned char *text = DfGetText(wnd);
+                       char *text = DfGetText(wnd);
                        unsigned oldpct = 100, cct = 0, len = strlen(text);
                        DFWINDOW swnd = DfSliderBox(20, DfGetTitle(wnd), "Printing");
                        /* ------- print the notepad text --------- */

diff --git a/rosapps/dflat32/helpbox.c b/rosapps/dflat32/helpbox.c
index 70d6ca4..01d2f1f 100644 (file)
--- a/rosapps/dflat32/helpbox.c
+++ b/rosapps/dflat32/helpbox.c
@@ -326,7 +326,7 @@ static void ReadHelp(DFWINDOW wnd)
     cwnd->wndproc = HelpTextProc;
     /* ----- read the help text ------- */
     while (TRUE)    {
-        unsigned char *cp = hline, *cp1;
+        char *cp = hline, *cp1;
         int colorct = 0;
         if (DfGetHelpLine(hline) == NULL)
             break;

diff --git a/rosapps/dflat32/menu.h b/rosapps/dflat32/menu.h
index a1b485a..cb269c4 100644 (file)
--- a/rosapps/dflat32/menu.h
+++ b/rosapps/dflat32/menu.h
@@ -10,7 +10,7 @@
 /* ----------- popdown menu selection structure
        one for each selection on a popdown menu --------- */
 struct DfPopDown {
-    unsigned char *SelectionTitle; /* title of the selection */
+    char *SelectionTitle;  /* title of the selection */
     int ActionId;          /* the command executed        */
     int Accelerator;       /* the accelerator key         */
     int Attrib;  /* DF_INACTIVE | DF_CHECKED | DF_TOGGLE | DF_CASCADED*/

diff --git a/rosapps/dflat32/popdown.c b/rosapps/dflat32/popdown.c
index 2fe650c..5c18781 100644 (file)
--- a/rosapps/dflat32/popdown.c
+++ b/rosapps/dflat32/popdown.c
@@ -83,8 +83,8 @@ static BOOL ButtonReleasedMsg(DFWINDOW wnd, DF_PARAM p1, DF_PARAM p2)
 static void PaintMsg(DFWINDOW wnd)
 {
     int wd;
-    unsigned char sep[80], *cp = sep;
-    unsigned char sel[80];
+    char sep[80], *cp = sep;
+    char sel[80];
     struct DfPopDown *ActivePopDown;
     struct DfPopDown *pd1;
 
@@ -371,10 +371,9 @@ static int SelectionWidth(struct DfPopDown *pd)
 }
 
 /* ----- copy a menu command to a display buffer ---- */
-int DfCopyCommand(unsigned char *dest, unsigned char *src,
-                                        int skipcolor, int bg)
+int DfCopyCommand(char *dest, char *src, int skipcolor, int bg)
 {
-    unsigned char *d = dest;
+    char *d = dest;
     while (*src && *src != '\n')    {
         if (*src == DF_SHORTCUTCHAR)    {
             src++;

diff --git a/rosapps/dflat32/textbox.c b/rosapps/dflat32/textbox.c
index 1c3497d..53243be 100644 (file)
--- a/rosapps/dflat32/textbox.c
+++ b/rosapps/dflat32/textbox.c
@@ -621,9 +621,9 @@ void DfWriteTextLine(DFWINDOW wnd, DFRECT *rcc, int y, BOOL reverse)
 {
     int len = 0;
     int dif = 0;
-    unsigned char line[200];
+    char line[200];
     DFRECT rc;
-    unsigned char *lp, *svlp;
+    char *lp, *svlp;
     int lnlen;
     int i;
     BOOL trunc = FALSE;
@@ -707,7 +707,7 @@ void DfWriteTextLine(DFWINDOW wnd, DFRECT *rcc, int y, BOOL reverse)
     for (i = 0; i < wnd->wleft+3; i++)    {
         if (*(lp+i) == '\0')
             break;
-        if (*(unsigned char *)(lp + i) == DF_RESETCOLOR)
+        if (*(lp + i) == DF_RESETCOLOR)
             break;
     }
     if (*(lp+i) && i < wnd->wleft+3)    {
@@ -721,7 +721,7 @@ void DfWriteTextLine(DFWINDOW wnd, DFRECT *rcc, int y, BOOL reverse)
         for (i = 0; i < wnd->wleft; i++)    {
             if (*(lp+i) == '\0')
                 break;
-            if (*(unsigned char *)(lp + i) == DF_CHANGECOLOR)    {
+            if (*(lp + i) == DF_CHANGECOLOR)    {
                 *(lp+wnd->wleft+2) = *(lp+i+2);
                 *(lp+wnd->wleft+1) = *(lp+i+1);
                 *(lp+wnd->wleft) = *(lp+i);
@@ -741,9 +741,9 @@ void DfWriteTextLine(DFWINDOW wnd, DFRECT *rcc, int y, BOOL reverse)
             char *initlp = lp;
             /* --- point to end of clipped line --- */
             while (ct)    {
-                if (*(unsigned char *)lp == DF_CHANGECOLOR)
+                if (*lp == DF_CHANGECOLOR)
                     lp += 3;
-                else if (*(unsigned char *)lp == DF_RESETCOLOR)
+                else if (*lp == DF_RESETCOLOR)
                     lp++;
                 else
                     lp++, --ct;
@@ -751,13 +751,12 @@ void DfWriteTextLine(DFWINDOW wnd, DFRECT *rcc, int y, BOOL reverse)
             if (DfRectLeft(rc))    {
                 char *lpp = lp;
                 while (*lpp)    {
-                    if (*(unsigned char*)lpp==DF_CHANGECOLOR)
+                    if (*lpp==DF_CHANGECOLOR)
                         break;
-                    if (*(unsigned char*)lpp==DF_RESETCOLOR) {
+                    if (*lpp==DF_RESETCOLOR) {
                         lpp = lp;
                         while (lpp >= initlp)    {
-                            if (*(unsigned char *)lpp ==
-                                            DF_CHANGECOLOR) {
+                            if (*lpp == DF_CHANGECOLOR) {
                                 lp -= 3;
                                 memmove(lp,lpp,3);
                                 break;
@@ -790,7 +789,7 @@ void DfWriteTextLine(DFWINDOW wnd, DFRECT *rcc, int y, BOOL reverse)
             cp += 2;
             *cp++ = DfBackground | 0x80;
         }
-        if (*(unsigned char *)line == DF_CHANGECOLOR)
+        if (*line == DF_CHANGECOLOR)
             dif = 3;
     }
     else

diff --git a/rosapps/dflat32/video.c b/rosapps/dflat32/video.c
index bbed0cc..ad68da0 100644 (file)
--- a/rosapps/dflat32/video.c
+++ b/rosapps/dflat32/video.c
@@ -186,7 +186,7 @@ void DfWPuts(DFWINDOW wnd, void *s, int x, int y)
                WORD attr[200];
                char *cp = ln;
                WORD *ap = attr;
-               unsigned char *str = s;
+               char *str = s;
                int fg = DfForeground;
                int bg = DfBackground;
                int len;

diff --git a/rosapps/dflat32/window.c b/rosapps/dflat32/window.c
index e1daf41..0cdc4fc 100644 (file)
--- a/rosapps/dflat32/window.c
+++ b/rosapps/dflat32/window.c
@@ -94,7 +94,7 @@ void DfInsertTitle(DFWINDOW wnd, char *ttl)
        strcpy(wnd->title, ttl);
 }
 
-static unsigned char line[300];
+static char line[300];
 
 /* ------ write a line to video window client area ------ */
 void DfWriteLine(DFWINDOW wnd, char *str, int x, int y, BOOL pad)

diff --git a/rosapps/games/solitaire/cardlib/cardbitmaps.cpp b/rosapps/games/solitaire/cardlib/cardbitmaps.cpp
index 9c5b4da..2611fa0 100644 (file)
--- a/rosapps/games/solitaire/cardlib/cardbitmaps.cpp
+++ b/rosapps/games/solitaire/cardlib/cardbitmaps.cpp
@@ -22,7 +22,7 @@ void PaintRect(HDC hdc, RECT *rect, COLORREF col);
 void LoadCardBitmapsFromLibrary(HINSTANCE hCardDll, int *pwidth, int *pheight)\r
 {\r
     HBITMAP   hBitmap;\r
-    HDC          hdcCard;\r
+    HDC          hdcCard = NULL;\r
     HANDLE      hOld;\r
     int        i, xpos;\r
     int        width, height;\r
@@ -41,16 +41,16 @@ void LoadCardBitmapsFromLibrary(HINSTANCE hCardDll, int *pwidth, int *pheight)
         \r
         width  = bmp.bmWidth;\r
         height = bmp.bmHeight;\r
-        \r
+\r
         if(i == 0)    //if first time through, create BIG bitmap..\r
         {\r
             HDC hdc = GetDC(0);\r
             __hdcCardBitmaps = CreateCompatibleDC(hdc);\r
             __hbmCardBitmaps = CreateCompatibleBitmap(hdc, width * NUMCARDBITMAPS, height);\r
             SelectObject(__hdcCardBitmaps, __hbmCardBitmaps);\r
-            \r
+\r
             hdcCard = CreateCompatibleDC(0);\r
-            \r
+\r
             ReleaseDC(0, hdc);\r
         }\r
         \r

diff --git a/rosapps/games/solitaire/cardlib/cardbutton.h b/rosapps/games/solitaire/cardlib/cardbutton.h
index 14be629..9ca402e 100644 (file)
--- a/rosapps/games/solitaire/cardlib/cardbutton.h
+++ b/rosapps/games/solitaire/cardlib/cardbutton.h
@@ -13,7 +13,7 @@ class CardButton
        //      Constructor is PRIVATE - only a\r
        //  CardWindow can create buttons!\r
        //\r
-       CardButton(CardWindow &parent, int id, TCHAR *szText, UINT style, bool visible, \r
+       CardButton(CardWindow &parent, int id, TCHAR *szText, UINT style, bool visible,\r
                int x, int y, int width, int height);\r
 \r
        ~CardButton();\r

diff --git a/rosapps/games/solitaire/cardlib/cardlib.h b/rosapps/games/solitaire/cardlib/cardlib.h
index bad3f0c..ee0ab4a 100644 (file)
--- a/rosapps/games/solitaire/cardlib/cardlib.h
+++ b/rosapps/games/solitaire/cardlib/cardlib.h
@@ -72,6 +72,7 @@ void CardLib_SetZoomSpeed(int);
 class CardRegion;\r
 class CardButton;\r
 class CardStack;\r
+class CardWindow;\r
 \r
 typedef bool (CARDLIBPROC *pCanDragProc)    (CardRegion &stackobj, int iNumDragging);\r
 typedef bool (CARDLIBPROC *pCanDropProc)    (CardRegion &stackobj, const CardStack &cards);\r

diff --git a/rosapps/mc/edit/edit.h b/rosapps/mc/edit/edit.h
index 0bdfc81..6428dd9 100644 (file)
--- a/rosapps/mc/edit/edit.h
+++ b/rosapps/mc/edit/edit.h
@@ -354,7 +354,7 @@ void edit_init_menu_emacs (void);
 void edit_init_menu_normal (void);
 void edit_done_menu (void);
 int edit_raw_key_query (char *heading, char *query, int cancel);
-char *strcasechr (const unsigned char *s, int c);
+char *strcasechr (const char *s, int c);
 int edit (const char *_file, int line);
 int edit_translate_key (WEdit * edit, unsigned int x_keycode, long x_key, int x_state, int *cmd, int *ch);
 

diff --git a/rosapps/mc/edit/editcmd.c b/rosapps/mc/edit/editcmd.c
index 7e8c372..c883a6c 100644 (file)
--- a/rosapps/mc/edit/editcmd.c
+++ b/rosapps/mc/edit/editcmd.c
@@ -62,12 +62,12 @@ static inline int my_lower_case (int c)
     return tolower(c);
 }
 
-char *strcasechr (const unsigned char *s, int c)
+char *strcasechr (const char *s, int c)
 {
     for (; my_lower_case ((int) *s) != my_lower_case (c); ++s)
        if (*s == '\0')
            return 0;
-    return (char *) s;
+    return (char *)s;
 }
 
 

diff --git a/rosapps/mc/pc/slint_pc.c b/rosapps/mc/pc/slint_pc.c
index 44f6f62..9aa9110 100644 (file)
--- a/rosapps/mc/pc/slint_pc.c
+++ b/rosapps/mc/pc/slint_pc.c
@@ -19,6 +19,8 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "../src/tty.h"
 #include "../src/mad.h"
 #include "../src/color.h"

diff --git a/rosapps/mc/slang/slvideo.c b/rosapps/mc/slang/slvideo.c
index 47cbf43..b877601 100644 (file)
--- a/rosapps/mc/slang/slvideo.c
+++ b/rosapps/mc/slang/slvideo.c
@@ -1019,7 +1019,7 @@ static void write_attributes (unsigned short *src, int count)
 #ifdef WIN32
    register unsigned char * org_src = (unsigned char*)src;
    COORD coord;
-   long bytes;
+   DWORD bytes;
 #endif
 #if !defined (USE_ASM)
 # if defined (HAS_LINEAR_SCREEN)
@@ -1057,7 +1057,7 @@ static void write_attributes (unsigned short *src, int count)
    p = Line_Buffer;
    coord.X = Cursor_Col;
    coord.Y = Cursor_Row;
-   WriteConsoleOutputCharacter(hStdout, p, count, coord, &bytes);
+   WriteConsoleOutputCharacter(hStdout, (char*)p, count, coord, &bytes);
 
   /* write color attributes */
    p = Line_Buffer;
@@ -1162,7 +1162,7 @@ void narrow_width (void)
 void SLtt_cls (void)
 {
 #ifdef WIN32
-   long bytes;
+   DWORD bytes;
    COORD coord;
    char ch;
 #endif
@@ -1224,7 +1224,7 @@ void SLtt_putchar (char ch)
 #if !defined (GO32_VIDEO) && !defined (EMX_VIDEO)
    unsigned short p, *pp;
 # if defined(WIN32)
-   long bytes;
+   DWORD bytes;
 # endif
 #endif
 

diff --git a/rosapps/mc/slang/slw32tty.c b/rosapps/mc/slang/slw32tty.c
index 20ebfea..a92c7d9 100644 (file)
--- a/rosapps/mc/slang/slw32tty.c
+++ b/rosapps/mc/slang/slw32tty.c
@@ -48,7 +48,7 @@ int SLang_init_tty (int abort_char, int no_flow_control, int opost)
 {
   SMALL_RECT windowRect;
   COORD newPosition;
-  long flags;
+  DWORD flags;
 
 #ifndef SLANG_SAVES_CONSOLE
   /* first off, create a new console so the old one can be restored on exit */
@@ -132,7 +132,7 @@ int SLsys_input_pending (int tsecs)
 {
    INPUT_RECORD record;
    long one = 1;
-   long bytesRead;
+   DWORD bytesRead;
 
    while (1)
      {
@@ -195,7 +195,8 @@ int SLsys_input_pending (int tsecs)
 unsigned int SLsys_getkey (void)
 {
   unsigned int scan, ch, shift;
-  long key, bytesRead;
+  long key;
+  DWORD bytesRead;
   INPUT_RECORD record;
 
   while (1) {

diff --git a/rosapps/mc/src/file.c b/rosapps/mc/src/file.c
index 026057e..4b63541 100644 (file)
--- a/rosapps/mc/src/file.c
+++ b/rosapps/mc/src/file.c
@@ -2381,7 +2381,7 @@ panel_operate (void *source_panel, int operation, char *thedefault)
        else
            dest_dir = panel->cwd;
 
-       rx.buffer = (char *) xmalloc (MC_MAXPATHLEN, "mask copying");
+       rx.buffer = (unsigned char *) xmalloc (MC_MAXPATHLEN, "mask copying");
        rx.allocated = MC_MAXPATHLEN;
        rx.translate = 0;
        dest = file_mask_dialog (operation, cmd_buf, dest_dir, only_one, &do_bg);

diff --git a/rosapps/mc/src/help.c b/rosapps/mc/src/help.c
index 25057f3..8c50edd 100644 (file)
--- a/rosapps/mc/src/help.c
+++ b/rosapps/mc/src/help.c
@@ -43,6 +43,7 @@
 #include <sys/stat.h>
 #include <malloc.h>
 #include <errno.h>
+#include <string.h>
 #include "mad.h"
 #include "color.h"
 #include "util.h"

diff --git a/rosapps/mc/src/menu.c b/rosapps/mc/src/menu.c
index 67bf3fc..9f68624 100644 (file)
--- a/rosapps/mc/src/menu.c
+++ b/rosapps/mc/src/menu.c
@@ -94,9 +94,9 @@ static void menubar_paint_idx (WMenu *menubar, int idx, int color)
         widget_move (&menubar->widget, y, x + 1);
        hline (slow_terminal ? ' ' : ACS_HLINE, menubar->max_entry_len);
     } else {
-       unsigned char *text = menu->entries [idx].text;
+       char *text = menu->entries [idx].text;
 
-       addch((unsigned char)menu->entries [idx].first_letter);
+       addch(menu->entries [idx].first_letter);
        for (text = menu->entries [idx].text; *text; text++)
        {
                if (*text == '&')

diff --git a/rosapps/mc/src/regex.c b/rosapps/mc/src/regex.c
index f511df8..3057dfd 100644 (file)
--- a/rosapps/mc/src/regex.c
+++ b/rosapps/mc/src/regex.c
@@ -4229,7 +4229,7 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
                /* Compare that many; failure if mismatch, else move
                    past them.  */
                if (translate
-                    ? bcmp_translate (d, d2, mcnt, translate)
+                    ? bcmp_translate ((unsigned char*)d, (unsigned char*)d2, mcnt, translate)
                     : bcmp (d, d2, mcnt))
                  goto fail;
                d += mcnt, d2 += mcnt;

diff --git a/rosapps/mc/src/view.c b/rosapps/mc/src/view.c
index 4e6379d..c0663b7 100644 (file)
--- a/rosapps/mc/src/view.c
+++ b/rosapps/mc/src/view.c
@@ -186,7 +186,7 @@ view_done (WView *view)
        set_monitor (view, off);
 #ifndef HAVE_MMAP
        /* alex: release core, used to replace mmap */
-       if (!view->growing_buffer && view->data != (unsigned char*)0)
+       if (!view->growing_buffer && view->data != NULL)
        {
                free(view->data);
                view->data = NULL;
@@ -547,12 +547,12 @@ static char *load_view_file (WView *view, char *filename)
        **      For those OS that dont provide mmap call. Try to load all the file
        **      into memory (alex@bcs.zaporizhzhe.ua)
        */
-       view->data = (unsigned char*) xmalloc (view->s.st_size, "load_view_file");
-    if (view->data == (unsigned char*) 0
+       view->data = (char*) xmalloc (view->s.st_size, "load_view_file");
+    if (view->data == NULL
                || mc_lseek(view->file,0,0) != 0
                || mc_read(view->file, view->data, view->s.st_size) != view->s.st_size
        ) {
-               if (view->data != (unsigned char*)0)
+               if (view->data != NULL)
                        free(view->data);
                close_view_file (view);
                return init_growing_view (view, 0, filename);

diff --git a/rosapps/mc/src/view.h b/rosapps/mc/src/view.h
index edc0a67..a096216 100644 (file)
--- a/rosapps/mc/src/view.h
+++ b/rosapps/mc/src/view.h
@@ -4,7 +4,7 @@
 #ifdef WANT_WIDGETS
 /* The growing buffers data types */
 typedef struct {
-    unsigned char *data;
+    char *data;
     int  present;              /* Unused, for DOS port maybe */
 } block_ptr_t;
 
@@ -22,7 +22,7 @@ typedef struct {
     int view_active;
     int have_frame;
 
-    unsigned char *data;       /* Memory area for the file to be viewed */
+    char *data;                        /* Memory area for the file to be viewed */
 
     /* File information */
     int file;                  /* File descriptor (for mmap and munmap) */

diff --git a/rosapps/mc/src/widget.c b/rosapps/mc/src/widget.c
index 2e19b5d..f7ba033 100644 (file)
--- a/rosapps/mc/src/widget.c
+++ b/rosapps/mc/src/widget.c
@@ -371,7 +371,7 @@ radio_callback (Dlg_head *h, WRadio *r, int Msg, int Par)
     case WIDGET_FOCUS:
     case WIDGET_DRAW:
        for (i = 0; i < r->count; i++){
-               register unsigned char* cp;
+               register char* cp;
            attrset ((i==r->pos && Msg==WIDGET_FOCUS) ? FOCUSC :NORMALC);
            widget_move (&r->widget, i, 0);
 

diff --git a/rosapps/packmgr/gui/main.c b/rosapps/packmgr/gui/main.c
index 727bfc1..c390cea 100644 (file)
--- a/rosapps/packmgr/gui/main.c
+++ b/rosapps/packmgr/gui/main.c
@@ -12,6 +12,27 @@
 \r
 #include "main.h"\r
 \r
+// This is the struct where the toolbar is defined\r
+const TBBUTTON Buttons [] =\r
+{\r
+       {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP},\r
+\r
+       {0, 1, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON}, // No Action\r
+       {1, 2, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON}, // Install\r
+       {2, 3, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON}, // Install from source\r
+       {3, 4, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON}, // Update\r
+       {4, 5, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON}, // Unistall\r
+\r
+       {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP},\r
+       {5, 6, TBSTATE_ENABLED, TBSTYLE_BUTTON}, // DoIt (tm)\r
+       {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP},\r
+\r
+       {6, 7, TBSTATE_ENABLED, TBSTYLE_BUTTON}, // Help\r
+       {7, 8, TBSTATE_ENABLED, TBSTYLE_BUTTON}, // Options\r
+\r
+       {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP},\r
+};\r
+\r
 \r
 // Application's Entry Point\r
 int WINAPI WinMain (HINSTANCE hinst, HINSTANCE hPrevInstance, PSTR szCmdLine, int iCmdShow)\r

diff --git a/rosapps/packmgr/gui/main.h b/rosapps/packmgr/gui/main.h
index e02f89a..d01354c 100644 (file)
--- a/rosapps/packmgr/gui/main.h
+++ b/rosapps/packmgr/gui/main.h
@@ -41,22 +41,5 @@ int Ask (const WCHAR* message);
 #define TBSTYLE_FLAT 2048\r
 \r
 // This is the struct where the toolbar is defined\r
-TBBUTTON Buttons [] = \r
-{\r
-       {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, 0},\r
-       \r
-       {0, 1, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0L, 0}, // No Action\r
-       {1, 2, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0L, 0}, // Install\r
-       {2, 3, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0L, 0}, // Install from source\r
-       {3, 4, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0L, 0}, // Update\r
-       {4, 5, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0L, 0}, // Unistall\r
-\r
-       {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, 0},\r
-       {5, 6, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0L, 0}, // DoIt (tm)\r
-       {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, 0},\r
-\r
-       {6, 7, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0L, 0}, // Help\r
-       {7, 8, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0L, 0}, // Options\r
-\r
-       {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, 0},\r
-}; \r
+extern const TBBUTTON Buttons [];\r
+\r

diff --git a/rosapps/sysutils/makefile b/rosapps/sysutils/makefile
index aada1ae..3e23aa7 100644 (file)
--- a/rosapps/sysutils/makefile
+++ b/rosapps/sysutils/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.15 2004/12/27 20:09:57 gvg Exp $
+# $Id$
 #
 # ReactOS System Utilities
 #
@@ -25,7 +25,7 @@
 PATH_TO_TOP=..
 PATH_TO_CVSROOT=../$(PATH_TO_TOP)
 
-BASE_CFLAGS = -I$(PATH_TO_CVSROOT)/reactos/include -D_M_IX86
+BASE_CFLAGS = -I$(PATH_TO_CVSROOT)/reactos/include -D_M_IX86 -Wno-strict-aliasing
 
 
 ROS_DIR=$(PATH_TO_CVSROOT)/reactos

diff --git a/rosapps/sysutils/pedump.c b/rosapps/sysutils/pedump.c
index 374da47..640717e 100644 (file)
--- a/rosapps/sysutils/pedump.c
+++ b/rosapps/sysutils/pedump.c
@@ -1149,7 +1149,7 @@ GetSectionNames (
 
   /* count the number of chars used in the section names */
   for (i = 0; i < nSections; i++)
-    nCnt += strlen (psh[i].Name) + 1;
+    nCnt += strlen ((char *)psh[i].Name) + 1;
 
   /* allocate space for all section names from heap */
   ps = *pszSections = (char *) calloc (nCnt, 1);
@@ -1157,8 +1157,8 @@ GetSectionNames (
 
   for (i = 0; i < nSections; i++)
     {
-      strcpy (ps, psh[i].Name);
-      ps += strlen (psh[i].Name) + 1;
+      strcpy (ps, (char *)psh[i].Name);
+      ps += strlen ((char *)psh[i].Name) + 1;
     }
 
   return nCnt;
@@ -1184,7 +1184,7 @@ GetSectionHdrByName (
       /* find the section by name */
       for (i = 0; i < nSections; i++)
        {
-         if (!strcmp (psh->Name, szSection))
+         if (!strcmp ((char *)psh->Name, szSection))
            {
              /* copy data to header */
              bcopy ((LPVOID) psh, (LPVOID) sh, sizeof (IMAGE_SECTION_HEADER));
@@ -3847,7 +3847,7 @@ RetrieveModuleName (
       if (pdd->Type == IMAGE_DEBUG_TYPE_MISC)
        {
          pdm = (PIMAGE_DEBUG_MISC) ((DWORD) pdd->PointerToRawData + (DWORD) lpFile);
-         *pszModule = (char *) calloc ((nCnt = (strlen (pdm->Data))) + 1, 1);
+         *pszModule = (char *) calloc ((nCnt = (strlen ((char *)pdm->Data))) + 1, 1);
          // may need some unicode business here...above
          bcopy (pdm->Data, *pszModule, nCnt);
 

diff --git a/rosapps/tests/hello/hello.c b/rosapps/tests/hello/hello.c
index bba959a..30d79b0 100644 (file)
--- a/rosapps/tests/hello/hello.c
+++ b/rosapps/tests/hello/hello.c
@@ -1,8 +1,12 @@
+#include <windows.h>
 #include <stdio.h>
 #include <string.h>
 
 int main(int argc, char* argv[])
 {
-   printf("Hello world\n");
+   WCHAR str[255];
+   
+   wsprintfW(str, L"%04X", 0xab34);
+   printf("%S\n", str);
    return(0);
 }