Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

by weiden＠svn.reactos.com

fixed warnings 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 _____ Modified: trunk/rosapps/dflat32/button.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; _____ Modified: trunk/rosapps/dflat32/dflat.h --- 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 *); _____ Modified: trunk/rosapps/dflat32/dialbox.c --- 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); _____ Modified: trunk/rosapps/dflat32/edit.c --- 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 --------- */ _____ Modified: trunk/rosapps/dflat32/helpbox.c --- 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; _____ Modified: trunk/rosapps/dflat32/menu.h --- 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*/ _____ Modified: trunk/rosapps/dflat32/popdown.c --- 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++; _____ Modified: trunk/rosapps/dflat32/textbox.c --- 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 _____ Modified: trunk/rosapps/dflat32/video.c --- 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; _____ Modified: trunk/rosapps/dflat32/window.c --- 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) _____ Modified: trunk/rosapps/games/solitaire/cardlib/cardbitmaps.cpp --- 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); } _____ Modified: trunk/rosapps/games/solitaire/cardlib/cardbutton.h --- 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(); _____ Modified: trunk/rosapps/games/solitaire/cardlib/cardlib.h --- 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); _____ Modified: trunk/rosapps/mc/edit/edit.h --- 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); _____ Modified: trunk/rosapps/mc/edit/editcmd.c --- 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; } _____ Modified: trunk/rosapps/mc/pc/slint_pc.c --- 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" _____ Modified: trunk/rosapps/mc/slang/slvideo.c --- 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 _____ Modified: trunk/rosapps/mc/slang/slw32tty.c --- 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) { _____ Modified: trunk/rosapps/mc/src/file.c --- 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); _____ Modified: trunk/rosapps/mc/src/help.c --- 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" _____ Modified: trunk/rosapps/mc/src/menu.c --- 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 == '&') _____ Modified: trunk/rosapps/mc/src/regex.c --- 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; _____ Modified: trunk/rosapps/mc/src/view.c --- 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(a)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); _____ Modified: trunk/rosapps/mc/src/view.h --- 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) */ _____ Modified: trunk/rosapps/mc/src/widget.c --- 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); _____ Modified: trunk/rosapps/packmgr/gui/main.c --- 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) { _____ Modified: trunk/rosapps/packmgr/gui/main.h --- 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}, -}; _____ Modified: trunk/rosapps/sysutils/makefile --- 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 _____ Modified: trunk/rosapps/sysutils/pedump.c --- 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); _____ Modified: trunk/rosapps/tests/hello/hello.c --- 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); }

19 years, 4 months

[weiden] 15217: fixed function prototype

by weiden＠svn.reactos.com

fixed function prototype Modified: trunk/reactos/include/funcs.h _____ Modified: trunk/reactos/include/funcs.h --- trunk/reactos/include/funcs.h 2005-05-11 15:24:59 UTC (rev 15216) +++ trunk/reactos/include/funcs.h 2005-05-11 16:15:25 UTC (rev 15217) @@ -2080,7 +2080,7 @@ DWORD dwTime); BOOL STDCALL DisplayExitWindowsWarnings(ULONG flags); FARPROC STDCALL DelayLoadFailureHook(unsigned int dliNotify, PDelayLoadInfo pdli); -VOID STDCALL WEP(); +VOID STDCALL WEP(VOID); DWORD STDCALL RtlDeleteSecurityObject(DWORD x1); DWORD STDCALL RtlNewSecurityObject(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6); NTSTATUS STDCALL RtlWalkHeap( HANDLE heap, PVOID entry_ptr );

19 years, 4 months

[mf] 15216: fix for updated MinGW headers: comditional compilation for HSHELL_RUDEAPPACTIVATED

by mf＠svn.reactos.com

fix for updated MinGW headers: comditional compilation for HSHELL_RUDEAPPACTIVATED Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp --- trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-05-11 14:50:00 UTC (rev 15215) +++ trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-05-11 15:24:59 UTC (rev 15216) @@ -196,6 +196,8 @@ case HSHELL_REDRAW: #ifdef HSHELL_FLASH case HSHELL_FLASH: +#endif +#ifdef HSHELL_RUDEAPPACTIVATED case HSHELL_RUDEAPPACTIVATED: #endif Refresh();

19 years, 4 months

[mf] 15215: some more spelling fixes

by mf＠svn.reactos.com

some more spelling fixes Modified: trunk/reactos/subsys/system/winefile/license.c Modified: trunk/reactos/subsys/system/winefile/resource.h Modified: trunk/reactos/subsys/system/winefile/resource.rc _____ Modified: trunk/reactos/subsys/system/winefile/license.c --- trunk/reactos/subsys/system/winefile/license.c 2005-05-11 14:49:24 UTC (rev 15214) +++ trunk/reactos/subsys/system/winefile/license.c 2005-05-11 14:50:00 UTC (rev 15215) @@ -1,5 +1,5 @@ /* - * Copyright 2000, 2003, 2004 Martin Fuchs + * Copyright 2000, 2003, 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public _____ Modified: trunk/reactos/subsys/system/winefile/resource.h --- trunk/reactos/subsys/system/winefile/resource.h 2005-05-11 14:49:24 UTC (rev 15214) +++ trunk/reactos/subsys/system/winefile/resource.h 2005-05-11 14:50:00 UTC (rev 15215) @@ -1,5 +1,5 @@ /* - * Copyright 2000, 2003 Martin Fuchs + * Copyright 2000, 2003, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -71,7 +71,7 @@ #define ID_NO_WARRANTY 0x8002 #define ID_WINDOW_AUTOSORT 0x8003 #define ID_VIEW_FULLSCREEN 0x8004 -#define ID_PREFERED_SIZES 0x8005 +#define ID_PREFERRED_SIZES 0x8005 /* string table */ _____ Modified: trunk/reactos/subsys/system/winefile/resource.rc --- trunk/reactos/subsys/system/winefile/resource.rc 2005-05-11 14:49:24 UTC (rev 15214) +++ trunk/reactos/subsys/system/winefile/resource.rc 2005-05-11 14:50:00 UTC (rev 15215) @@ -25,7 +25,7 @@ #ifndef _NO_EXTENSIONS "X", ID_FILE_EXIT, VIRTKEY, ALT, NOINVERT "S", ID_VIEW_FULLSCREEN, VIRTKEY, SHIFT, CONTROL, NOINVERT - VK_ADD, ID_PREFERED_SIZES, VIRTKEY, CONTROL, NOINVERT + VK_ADD, ID_PREFERRED_SIZES, VIRTKEY, CONTROL, NOINVERT #endif }

19 years, 4 months

[mf] 15214: Sync to Wine:

by mf＠svn.reactos.com

Sync to Wine: date: 2005/02/25 14:07:56 Jon Griffiths <jon_p_griffiths(a)yahoo.com> Documentation spelling fixes. Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-11 14:46:42 UTC (rev 15213) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-11 14:49:24 UTC (rev 15214) @@ -2205,7 +2205,7 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWidthCol); -/* calculate prefered width for all visible columns */ +/* calculate preferred width for all visible columns */ static BOOL calc_widths(Pane* pane, BOOL anyway) { @@ -2292,7 +2292,7 @@ } -/* calculate one prefered column width */ +/* calculate one preferred column width */ static void calc_single_width(Pane* pane, int col) { @@ -3396,7 +3396,7 @@ break; #ifndef _NO_EXTENSIONS - case ID_PREFERED_SIZES: { + case ID_PREFERRED_SIZES: { calc_widths(pane, TRUE); set_header(pane); InvalidateRect(pane->hwnd, 0, TRUE);

19 years, 4 months

[mf] 15213: Sync to Wine: (rewritten bug fix)

by mf＠svn.reactos.com

Sync to Wine: (rewritten bug fix) date: 2004/12/14 11:43:30 Piotr Caban <pio13(a)poczta.onet.pl> Fixed display bug. Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-11 14:36:40 UTC (rev 15212) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-11 14:46:42 UTC (rev 15213) @@ -2354,12 +2354,12 @@ /* insert listbox entries after index idx */ -static void insert_entries(Pane* pane, Entry* dir, int idx) +static int insert_entries(Pane* pane, Entry* dir, int idx) { Entry* entry = dir; if (!entry) - return; + return idx; ShowWindow(pane->hwnd, SW_HIDE); @@ -2385,10 +2385,12 @@ ListBox_InsertItemData(pane->hwnd, idx, entry); if (pane->treePane && entry->expanded) - insert_entries(pane, entry->down, idx); + idx = insert_entries(pane, entry->down, idx); } ShowWindow(pane->hwnd, SW_SHOW); + + return idx; }

19 years, 4 months

[mf] 15212: Sync to Wine:

by mf＠svn.reactos.com

Sync to Wine: date: 2004/11/30 21:38:57 Eric Pouech <pouech-eric(a)wanadoo.fr> Const correctness fixes. Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-11 14:33:51 UTC (rev 15211) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-11 14:36:40 UTC (rev 15212) @@ -1103,8 +1103,8 @@ static int compareName(const void* arg1, const void* arg2) { - const WIN32_FIND_DATA* fd1 = &(*(Entry**)arg1)->data; - const WIN32_FIND_DATA* fd2 = &(*(Entry**)arg2)->data; + const WIN32_FIND_DATA* fd1 = &(*(const Entry* const*)arg1)->data; + const WIN32_FIND_DATA* fd2 = &(*(const Entry* const*)arg2)->data; int cmp = compareType(fd1, fd2); if (cmp) @@ -1115,8 +1115,8 @@ static int compareExt(const void* arg1, const void* arg2) { - const WIN32_FIND_DATA* fd1 = &(*(Entry**)arg1)->data; - const WIN32_FIND_DATA* fd2 = &(*(Entry**)arg2)->data; + const WIN32_FIND_DATA* fd1 = &(*(const Entry* const*)arg1)->data; + const WIN32_FIND_DATA* fd2 = &(*(const Entry* const*)arg2)->data; const TCHAR *name1, *name2, *ext1, *ext2; int cmp = compareType(fd1, fd2); @@ -1148,8 +1148,8 @@ static int compareSize(const void* arg1, const void* arg2) { - WIN32_FIND_DATA* fd1 = &(*(Entry**)arg1)->data; - WIN32_FIND_DATA* fd2 = &(*(Entry**)arg2)->data; + const WIN32_FIND_DATA* fd1 = &(*(const Entry* const*)arg1)->data; + const WIN32_FIND_DATA* fd2 = &(*(const Entry* const*)arg2)->data; int cmp = compareType(fd1, fd2); if (cmp) @@ -1169,8 +1169,8 @@ static int compareDate(const void* arg1, const void* arg2) { - WIN32_FIND_DATA* fd1 = &(*(Entry**)arg1)->data; - WIN32_FIND_DATA* fd2 = &(*(Entry**)arg2)->data; + const WIN32_FIND_DATA* fd1 = &(*(const Entry* const*)arg1)->data; + const WIN32_FIND_DATA* fd2 = &(*(const Entry* const*)arg2)->data; int cmp = compareType(fd1, fd2); if (cmp)

19 years, 4 months

[mf] 15211: - Sync to Wine:

by mf＠svn.reactos.com

- Sync to Wine: date: 2004/11/24 18:28:31; author: julliard Avoid using the MAKEPOINTS macro, it's broken on big endian. - Fix of this patch: use screen relative coordinates for ShellFolderContextMenu() Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-11 14:19:23 UTC (rev 15210) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-11 14:33:51 UTC (rev 15211) @@ -1,7 +1,7 @@ /* * Winefile * - * Copyright 2000, 2003, 2004 Martin Fuchs + * Copyright 2000, 2003, 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -3768,16 +3768,17 @@ #ifdef _SHELL_FOLDERS case WM_CONTEXTMENU: { + POINT pt, pt_clnt; Pane* pane; int idx; /* first select the current item in the listbox */ HWND hpanel = (HWND) wparam; - POINTS* ppos = &MAKEPOINTS(lparam); - POINT pt; POINTSTOPOINT(pt, *ppos); - ScreenToClient(hpanel, &pt); - SendMessage(hpanel, WM_LBUTTONDOWN, 0, MAKELONG(pt.x, pt.y)); - SendMessage(hpanel, WM_LBUTTONUP, 0, MAKELONG(pt.x, pt.y)); + pt_clnt.x = pt.x = (short)LOWORD(lparam); + pt_clnt.y = pt.y = (short)HIWORD(lparam); + ScreenToClient(hpanel, &pt_clnt); + SendMessage(hpanel, WM_LBUTTONDOWN, 0, MAKELONG(pt_clnt.x, pt_clnt.y)); + SendMessage(hpanel, WM_LBUTTONUP, 0, MAKELONG(pt_clnt.x, pt_clnt.y)); /* now create the popup menu using shell namespace and IContextMenu */ pane = GetFocus()==child->left.hwnd? &child->left: &child->right; @@ -3795,7 +3796,7 @@ /* get and use the parent folder to display correct context menu in all cases */ if (SUCCEEDED(SHBindToParent(pidl_abs, &IID_IShellFolder, (LPVOID*)&parentFolder, &pidlLast))) { - hr = ShellFolderContextMenu(parentFolder, hwnd, 1, &pidlLast, ppos->x, ppos->y); + hr = ShellFolderContextMenu(parentFolder, hwnd, 1, &pidlLast, pt.x, pt.y); (*parentFolder->lpVtbl->Release)(parentFolder); }

19 years, 4 months

[mf] 15210: Sync to Wine:

by mf＠svn.reactos.com

Sync to Wine: date: 2005/02/23 20:58:09 Henning Gerhardt <henning.gerhardt(a)web.de> Small fix for the German resource file. date: 2005/02/15 20:46:19 Henning Gerhardt <henning.gerhardt(a)web.de> Add/updated German resources. Modified: trunk/reactos/subsys/system/winefile/de.rc _____ Modified: trunk/reactos/subsys/system/winefile/de.rc --- trunk/reactos/subsys/system/winefile/de.rc 2005-05-11 14:18:24 UTC (rev 15209) +++ trunk/reactos/subsys/system/winefile/de.rc 2005-05-11 14:19:23 UTC (rev 15210) @@ -31,7 +31,7 @@ { POPUP "&Datei" { MENUITEM "Í&ffnen\tEingabetaste" , 101 - MENUITEM "&Verschieben...\tF7" , 106 + MENUITEM "&Verschieben...\tF7" , ID_FILE_MOVE MENUITEM "&Kopieren...\tF8" , 107 MENUITEM "&In Zwischenablage...\tF9" , 118 MENUITEM "&L÷schen\tEntf" , 108 @@ -163,6 +163,19 @@ PUSHBUTTON "&Hilfe" , 254, 158, 43, 47, 14 } +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ziel auswõhlen" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Verzeichnis:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 + PUSHBUTTON "Abbrechen" , 2, 158, 23, 47, 14 + PUSHBUTTON "&Durchsuchen" , 254, 158, 43, 47, 14 +} + STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Anwenden der Schriftarteinstellung"

19 years, 4 months

[mf] 15209: Sync to wine:

by mf＠svn.reactos.com

Sync to wine: date: 2005/02/14 11:12:30 Marcelo Duarte <wine-devel(a)bol.com.br> Update the resources for Portuguese. date: 2005/02/10 17:14:15 Américo José Melo <mmodem00(a)netvisao.pt> Francois Gouget <fgouget(a)codeweavers.com> Translate the Wine resources to Portuguese. Modified: trunk/reactos/subsys/system/winefile/pt.rc _____ Modified: trunk/reactos/subsys/system/winefile/pt.rc --- trunk/reactos/subsys/system/winefile/pt.rc 2005-05-11 14:16:05 UTC (rev 15208) +++ trunk/reactos/subsys/system/winefile/pt.rc 2005-05-11 14:18:24 UTC (rev 15209) @@ -3,6 +3,7 @@ * Portuguese Language Support * * Copyright 2003 Marcelo Duarte + * Copyright 2004 AmÚrico JosÚ Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,16 +20,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT - /* Menu */ +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + IDM_WINEFILE MENU FIXED IMPURE { POPUP "&Arquivo" { MENUITEM "A&brir\tEnter" , 101 - MENUITEM "&Mover...\tF7" , 106 + MENUITEM "&Mover...\tF7" , ID_FILE_MOVE MENUITEM "&Copiar...\tF8" , 107 MENUITEM "&In Clipboard...\tF9" , 118 MENUITEM "E&xcluir\tDel" , 108 @@ -101,7 +102,7 @@ POPUP "&Opþ§es" { MENUITEM "&ConfirmaþÒo..." , -1 - MENUITEM "&Fonte..." , -1 + MENUITEM "&Fonte..." , ID_SELECT_FONT MENUITEM "&Personalizar barra de ferramentas..." , -1 MENUITEM SEPARATOR MENUITEM "Barra d&e ferramentas" , ID_VIEW_TOOL_BAR, CHECKED @@ -150,6 +151,136 @@ } +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "&Ficheiro" { + MENUITEM "A&brir\tEnter" , 101 + MENUITEM "&Mover...\tF7" , ID_FILE_MOVE + MENUITEM "&Copiar...\tF8" , 107 + MENUITEM "&Na Area de Transferencia...\tF9" , 118 + MENUITEM "E&xcluir\tDel" , 108 + MENUITEM "Re&nomear..." , 109 + MENUITEM "&Propriedades...\tAlt+Enter" , ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "C&omprimir..." , 119 + MENUITEM "&Descomprimir..." , 120 + MENUITEM SEPARATOR + MENUITEM "Execu&tar..." , ID_EXECUTE + MENUITEM "&Imprimir..." , 102 + MENUITEM "A&ssociar..." , 103 + MENUITEM SEPARATOR + MENUITEM "Cri&ar pasta..." , 111 + MENUITEM "P&esquisar..." , 104 + MENUITEM "Selecionar fichei&ros..." , 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "Sai&r\tAlt+X" , ID_FILE_EXIT +#else + MENUITEM "Sai&r", ID_FILE_EXIT +#endif + } + + POPUP "&Disco" { + MENUITEM "&Copiar disco..." , 201 + MENUITEM "&Nomear disco..." , 202 + MENUITEM SEPARATOR + MENUITEM "&Formatar disco..." , 203 +#ifdef _WIN95 + MENUITEM "&Gerar disco de sistema...", -1 /*@@ */ +#endif + MENUITEM SEPARATOR + MENUITEM "Conecta&r unidade de rede" , 252 + MENUITEM "&Desconectar unidade de rede" , 253 + MENUITEM SEPARATOR + MENUITEM "&Partilhar como..." , 254 + MENUITEM "&Remover partilha..." , 255 + MENUITEM SEPARATOR + MENUITEM "Seleccionar &unidade..." , 251 + } + + POPUP "?&rvore" { + MENUITEM "&Pr¾ximo nÝvel\t+" , 301 + MENUITEM "Expandi&r pasta\t*" , 302 + MENUITEM "Expandir &tudo\tStrg+*" , 303 + MENUITEM "Recolher p&asta\t-" , 304 + MENUITEM SEPARATOR + MENUITEM "&Indicar subnÝveis" , 505 + } + + POPUP "&Exibir" { + MENUITEM "?&rvore e pasta" , 413 + MENUITEM "S&omente ßrvore" , 411 + MENUITEM "So&mente pasta" , 412 + MENUITEM SEPARATOR + MENUITEM "&Dividir" , 414 + MENUITEM SEPARATOR + MENUITEM "&Nome" , ID_VIEW_NAME + MENUITEM "&Todos os delalhes" , ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "D&etalhes parciais..." , ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Classificar por nome" , 404 + MENUITEM "C&lassificar por tipo" , 405 + MENUITEM "Cl&assificar por tamanho" , 406 + MENUITEM "Cla&ssificar por &data" , 407 + MENUITEM SEPARATOR + MENUITEM "Classificar &por..." , 409 + } + + POPUP "&Opþ§es" { + MENUITEM "&ConfirmaþÒo..." , -1 + MENUITEM "&Fonte..." , ID_SELECT_FONT + MENUITEM "&Personalizar barra de ferramentas..." , -1 + MENUITEM SEPARATOR + MENUITEM "Barra d&e ferramentas" , ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&Barra de unidades" , ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "B&arra de e&stado" , ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "EcrÒ Complecto\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&Minimizar durante o uso" , -1 + MENUITEM "&Gravar configuraþ§es ao sair" , 511 + } + + + POPUP "&Seguranþa" { + MENUITEM "&Acesso..." , 605 + MENUITEM "&Logging..." , 606 + MENUITEM "&Dono..." , 607 + } + + POPUP "&Janela" { + MENUITEM "&Nova janela" , ID_WINDOW_NEW + MENUITEM "&Em cascata\tCtrl+F5" , ID_WINDOW_CASCADE + MENUITEM "Lado a lado &horizontalmente" , ID_WINDOW_TILE_HORZ + MENUITEM "Lado a lado &verticalmente\tCtrl+F4" , ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "Organizar automaticamente" , ID_WINDOW_AUTOSORT +#endif + MENUITEM "&Organizar Ýcones" , ID_WINDOW_ARRANGE + MENUITEM "&Actualizar\tF5" , ID_REFRESH + } + + POPUP "Aj&uda" { + MENUITEM "&T¾picos da ajuda\tF1" , ID_HELP + MENUITEM "Pesquisar..." , ID_HELP + MENUITEM "&Usando a ajuda" , ID_HELP_USING + MENUITEM SEPARATOR + POPUP "&Informaþ§es..." { + MENUITEM "Acerca do &Wine..." , ID_ABOUT_WINE +/* + * MENUITEM "&Licenþa..." ID_LICENSE + * MENUITEM "&SEM GARANTIA" ID_NO_WARRANTY + */ + } + } +} + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Executar" @@ -163,3 +294,49 @@ PUSHBUTTON "Cancelar" , 2, 158, 23, 47, 14 PUSHBUTTON "&Ajuda" , 254, 158, 43, 47, 14 } + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Selecionar destino" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Caminho:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 + PUSHBUTTON "Cancelar" , 2, 158, 23, 47, 14 + PUSHBUTTON "&Procurar" , 254, 158, 43, 47, 14 +} + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "Aplicando configuraþ§es de fonte" + IDS_FONT_SEL_ERROR "Erro enquanto seleciona nova fonte." +} + +STRINGTABLE +{ + IDS_WINEFILE "Winefile" + IDS_ERROR "Erro" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "?rea de trabalho" + IDS_SHELL "Shell" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Ainda nÒo implementado" + IDS_WINE "WINE" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "Nome" + IDS_COL_SIZE "Tamanho" + IDS_COL_CDATE "CData" + IDS_COL_ADATE "AData" + IDS_COL_MDATE "MData" + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "Ligaþ§es" + IDS_COL_ATTR "Atributos" + IDS_COL_SEC "Seguranþa" +}

19 years, 4 months

← Newer
1
...
47
48
49
50
51
52
53
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005