Modified: trunk/rosapps/dflat32/button.c
Modified: trunk/rosapps/dflat32/dflat.h
Modified: trunk/rosapps/dflat32/dialbox.c
Modified: trunk/rosapps/dflat32/edit.c
Modified: trunk/rosapps/dflat32/helpbox.c
Modified: trunk/rosapps/dflat32/menu.h
Modified: trunk/rosapps/dflat32/popdown.c
Modified: trunk/rosapps/dflat32/textbox.c
Modified: trunk/rosapps/dflat32/video.c
Modified: trunk/rosapps/dflat32/window.c
Modified: trunk/rosapps/games/solitaire/cardlib/cardbitmaps.cpp
Modified: trunk/rosapps/games/solitaire/cardlib/cardbutton.h
Modified: trunk/rosapps/games/solitaire/cardlib/cardlib.h
Modified: trunk/rosapps/mc/edit/edit.h
Modified: trunk/rosapps/mc/edit/editcmd.c
Modified: trunk/rosapps/mc/pc/slint_pc.c
Modified: trunk/rosapps/mc/slang/slvideo.c
Modified: trunk/rosapps/mc/slang/slw32tty.c
Modified: trunk/rosapps/mc/src/file.c
Modified: trunk/rosapps/mc/src/help.c
Modified: trunk/rosapps/mc/src/menu.c
Modified: trunk/rosapps/mc/src/regex.c
Modified: trunk/rosapps/mc/src/view.c
Modified: trunk/rosapps/mc/src/view.h
Modified: trunk/rosapps/mc/src/widget.c
Modified: trunk/rosapps/packmgr/gui/main.c
Modified: trunk/rosapps/packmgr/gui/main.h
Modified: trunk/rosapps/sysutils/makefile
Modified: trunk/rosapps/sysutils/pedump.c
Modified: trunk/rosapps/tests/hello/hello.c
--- trunk/rosapps/dflat32/button.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/dflat32/button.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -18,7 +18,7 @@
}
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;
--- trunk/rosapps/dflat32/dflat.h 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/dflat32/dflat.h 2005-05-11 16:50:39 UTC (rev 15218)
@@ -101,7 +101,7 @@
/* ----------------- 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 @@
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 @@
/* --------- 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 @@
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 *);
--- trunk/rosapps/dflat32/dialbox.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/dflat32/dialbox.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -430,7 +430,7 @@
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);
--- trunk/rosapps/dflat32/edit.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/dflat32/edit.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -393,7 +393,7 @@
{
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 --------- */
--- trunk/rosapps/dflat32/helpbox.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/dflat32/helpbox.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -326,7 +326,7 @@
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;
--- trunk/rosapps/dflat32/menu.h 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/dflat32/menu.h 2005-05-11 16:50:39 UTC (rev 15218)
@@ -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*/
--- trunk/rosapps/dflat32/popdown.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/dflat32/popdown.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -83,8 +83,8 @@
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 @@
}
/* ----- 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++;
--- trunk/rosapps/dflat32/textbox.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/dflat32/textbox.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -621,9 +621,9 @@
{
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 @@
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 @@
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 @@
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 @@
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 @@
cp += 2;
*cp++ = DfBackground | 0x80;
}
- if (*(unsigned char *)line == DF_CHANGECOLOR)
+ if (*line == DF_CHANGECOLOR)
dif = 3;
}
else
--- trunk/rosapps/dflat32/video.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/dflat32/video.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -186,7 +186,7 @@
WORD attr[200];
char *cp = ln;
WORD *ap = attr;
- unsigned char *str = s;
+ char *str = s;
int fg = DfForeground;
int bg = DfBackground;
int len;
--- trunk/rosapps/dflat32/window.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/dflat32/window.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -94,7 +94,7 @@
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)
--- trunk/rosapps/games/solitaire/cardlib/cardbitmaps.cpp 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/games/solitaire/cardlib/cardbitmaps.cpp 2005-05-11 16:50:39 UTC (rev 15218)
@@ -22,7 +22,7 @@
void LoadCardBitmapsFromLibrary(HINSTANCE hCardDll, int *pwidth, int *pheight)
{
HBITMAP hBitmap;
- HDC hdcCard;
+ HDC hdcCard = NULL;
HANDLE hOld;
int i, xpos;
int width, height;
@@ -41,16 +41,16 @@
width = bmp.bmWidth;
height = bmp.bmHeight;
-
+
if(i == 0) //if first time through, create BIG bitmap..
{
HDC hdc = GetDC(0);
__hdcCardBitmaps = CreateCompatibleDC(hdc);
__hbmCardBitmaps = CreateCompatibleBitmap(hdc, width * NUMCARDBITMAPS, height);
SelectObject(__hdcCardBitmaps, __hbmCardBitmaps);
-
+
hdcCard = CreateCompatibleDC(0);
-
+
ReleaseDC(0, hdc);
}
--- trunk/rosapps/games/solitaire/cardlib/cardbutton.h 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/games/solitaire/cardlib/cardbutton.h 2005-05-11 16:50:39 UTC (rev 15218)
@@ -13,7 +13,7 @@
// Constructor is PRIVATE - only a
// CardWindow can create buttons!
//
- CardButton(CardWindow &parent, int id, TCHAR *szText, UINT style, bool visible,
+ CardButton(CardWindow &parent, int id, TCHAR *szText, UINT style, bool visible,
int x, int y, int width, int height);
~CardButton();
--- trunk/rosapps/games/solitaire/cardlib/cardlib.h 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/games/solitaire/cardlib/cardlib.h 2005-05-11 16:50:39 UTC (rev 15218)
@@ -72,6 +72,7 @@
class CardRegion;
class CardButton;
class CardStack;
+class CardWindow;
typedef bool (CARDLIBPROC *pCanDragProc) (CardRegion &stackobj, int iNumDragging);
typedef bool (CARDLIBPROC *pCanDropProc) (CardRegion &stackobj, const CardStack &cards);
--- trunk/rosapps/mc/edit/edit.h 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/mc/edit/edit.h 2005-05-11 16:50:39 UTC (rev 15218)
@@ -354,7 +354,7 @@
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);
--- trunk/rosapps/mc/edit/editcmd.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/mc/edit/editcmd.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -62,12 +62,12 @@
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;
}
--- trunk/rosapps/mc/pc/slint_pc.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/mc/pc/slint_pc.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -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"
--- trunk/rosapps/mc/slang/slvideo.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/mc/slang/slvideo.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -1019,7 +1019,7 @@
#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 @@
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 SLtt_cls (void)
{
#ifdef WIN32
- long bytes;
+ DWORD bytes;
COORD coord;
char ch;
#endif
@@ -1224,7 +1224,7 @@
#if !defined (GO32_VIDEO) && !defined (EMX_VIDEO)
unsigned short p, *pp;
# if defined(WIN32)
- long bytes;
+ DWORD bytes;
# endif
#endif
--- trunk/rosapps/mc/slang/slw32tty.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/mc/slang/slw32tty.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -48,7 +48,7 @@
{
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 @@
{
INPUT_RECORD record;
long one = 1;
- long bytesRead;
+ DWORD bytesRead;
while (1)
{
@@ -195,7 +195,8 @@
unsigned int SLsys_getkey (void)
{
unsigned int scan, ch, shift;
- long key, bytesRead;
+ long key;
+ DWORD bytesRead;
INPUT_RECORD record;
while (1) {
--- trunk/rosapps/mc/src/file.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/mc/src/file.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -2381,7 +2381,7 @@
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);
--- trunk/rosapps/mc/src/help.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/mc/src/help.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -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"
--- trunk/rosapps/mc/src/menu.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/mc/src/menu.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -94,9 +94,9 @@
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 == '&')
--- trunk/rosapps/mc/src/regex.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/mc/src/regex.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -4229,7 +4229,7 @@
/* 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;
--- trunk/rosapps/mc/src/view.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/mc/src/view.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -186,7 +186,7 @@
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 @@
** 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);
--- trunk/rosapps/mc/src/view.h 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/mc/src/view.h 2005-05-11 16:50:39 UTC (rev 15218)
@@ -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 @@
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) */
--- trunk/rosapps/mc/src/widget.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/mc/src/widget.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -371,7 +371,7 @@
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);
--- trunk/rosapps/packmgr/gui/main.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/packmgr/gui/main.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -12,7 +12,28 @@
#include "main.h"
+// This is the struct where the toolbar is defined
+const TBBUTTON Buttons [] =
+{
+ {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP},
+ {0, 1, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON}, // No Action
+ {1, 2, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON}, // Install
+ {2, 3, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON}, // Install from source
+ {3, 4, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON}, // Update
+ {4, 5, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON}, // Unistall
+
+ {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP},
+ {5, 6, TBSTATE_ENABLED, TBSTYLE_BUTTON}, // DoIt (tm)
+ {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP},
+
+ {6, 7, TBSTATE_ENABLED, TBSTYLE_BUTTON}, // Help
+ {7, 8, TBSTATE_ENABLED, TBSTYLE_BUTTON}, // Options
+
+ {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP},
+};
+
+
// Application's Entry Point
int WINAPI WinMain (HINSTANCE hinst, HINSTANCE hPrevInstance, PSTR szCmdLine, int iCmdShow)
{
--- trunk/rosapps/packmgr/gui/main.h 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/packmgr/gui/main.h 2005-05-11 16:50:39 UTC (rev 15218)
@@ -41,22 +41,5 @@
#define TBSTYLE_FLAT 2048
// This is the struct where the toolbar is defined
-TBBUTTON Buttons [] =
-{
- {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, 0},
-
- {0, 1, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0L, 0}, // No Action
- {1, 2, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0L, 0}, // Install
- {2, 3, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0L, 0}, // Install from source
- {3, 4, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0L, 0}, // Update
- {4, 5, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0L, 0}, // Unistall
+extern const TBBUTTON Buttons [];
- {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, 0},
- {5, 6, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0L, 0}, // DoIt (tm)
- {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, 0},
-
- {6, 7, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0L, 0}, // Help
- {7, 8, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0L, 0}, // Options
-
- {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, 0},
-};
--- trunk/rosapps/sysutils/makefile 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/sysutils/makefile 2005-05-11 16:50:39 UTC (rev 15218)
@@ -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
--- trunk/rosapps/sysutils/pedump.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/sysutils/pedump.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -1149,7 +1149,7 @@
/* 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 @@
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 @@
/* 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 @@
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);
--- trunk/rosapps/tests/hello/hello.c 2005-05-11 16:15:25 UTC (rev 15217)
+++ trunk/rosapps/tests/hello/hello.c 2005-05-11 16:50:39 UTC (rev 15218)
@@ -1,3 +1,4 @@
+#include <windows.h>
#include <stdio.h>
#include <string.h>
@@ -3,5 +4,8 @@
int main(int argc, char* argv[])
{
- printf("Hello world\n");
+ WCHAR str[255];
+
+ wsprintfW(str, L"%04X", 0xab34);
+ printf("%S\n", str);
return(0);
}