Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[dgorbachev] 40769: Danish translation of shell32 and userenv DLLs by Thomas Larsen (sikker2004 "at" yahoo "dot" com). Bug #571.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sat May 2 03:54:31 2009 New Revision: 40769 URL: http://svn.reactos.org/svn/reactos?rev=40769&view=rev Log: Danish translation of shell32 and userenv DLLs by Thomas Larsen (sikker2004 "at" yahoo "dot" com). Bug #571. Added: trunk/reactos/dll/win32/userenv/lang/da-DK.rc (with props) Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/userenv/userenv.rc Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Sat May 2 03:54:31 2009 @@ -1,29 +1,17 @@ -/* - * Copyright 1998 Juergen Schmied - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +/* PROJECT: ReactOS Shell Library + * FILE: dll/win32/shell32/lang/da-DK.rc + * PURPOSE: Danish resource file + * UPDATED: 01 May 2009 */ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT MENU_001 MENU DISCARDABLE BEGIN - MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON - MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON - MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "Sto&re Ikoner", FCIDM_SHVIEW_BIGICON + MENUITEM "S&må Ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END /* shellview background menu */ @@ -31,31 +19,31 @@ BEGIN POPUP "" BEGIN - POPUP "&View" + POPUP "&Visning" BEGIN - MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON - MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON - MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "Sto&re Ikoner", FCIDM_SHVIEW_BIGICON + MENUITEM "S&må Ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR - POPUP "Arrange &Icons" + POPUP "Arrangere &Ikoner" BEGIN - MENUITEM "By &Name", 0x30 /* column 0 */ - MENUITEM "By &Type", 0x32 /* column 2 */ - MENUITEM "By &Size", 0x31 /* ... */ - MENUITEM "By &Date", 0x33 + MENUITEM "Efter &Navn", 0x30 /* column 0 */ + MENUITEM "Efter &Type", 0x32 /* column 2 */ + MENUITEM "Efter &Størrelse", 0x31 /* ... */ + MENUITEM "Efter &Dato", 0x33 MENUITEM SEPARATOR - MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE + MENUITEM "&Arrangere Automatisk", FCIDM_SHVIEW_AUTOARRANGE END - MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM "Line up Ikoner", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR - MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH + MENUITEM "Opfrisk", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR - MENUITEM "Paste", FCIDM_SHVIEW_INSERT - MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Indsæt", FCIDM_SHVIEW_INSERT + MENUITEM "Indsæt som Link", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR - MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES + MENUITEM "Egenskaber", FCIDM_SHVIEW_PROPERTIES END END @@ -64,27 +52,27 @@ BEGIN POPUP "" BEGIN - MENUITEM "E&xplore", FCIDM_SHVIEW_EXPLORE - MENUITEM "&Open", FCIDM_SHVIEW_OPEN + MENUITEM "E&xplore", FCIDM_SHVIEW_EXPLORE + MENUITEM "&Åbn", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR - MENUITEM "C&ut", FCIDM_SHVIEW_CUT - MENUITEM "&Copy", FCIDM_SHVIEW_COPY + MENUITEM "K&lip", FCIDM_SHVIEW_CUT + MENUITEM "&Kopiere", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "Create &Link", FCIDM_SHVIEW_CREATELINK - MENUITEM "&Delete", FCIDM_SHVIEW_DELETE - MENUITEM "&Rename", FCIDM_SHVIEW_RENAME + MENUITEM "Opret &Link", FCIDM_SHVIEW_CREATELINK + MENUITEM "&Slet", FCIDM_SHVIEW_DELETE + MENUITEM "&Omdøb", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR - MENUITEM "&Properties", FCIDM_SHVIEW_PROPERTIES + MENUITEM "&Egenskabe", FCIDM_SHVIEW_PROPERTIES END END SHBRSFORFOLDER_MSGBOX DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Browse for Folder" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP +CAPTION "Søg efter Mappe" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Fortryd", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP LTEXT "", IDD_TITLE, 4, 4, 180, 12 LTEXT "", IDD_STATUS, 4, 25, 180, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 @@ -149,16 +137,16 @@ SHELL_RUN_DLG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "" +CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 + LTEXT "Indtast navnet på det program, mappe, dokument, eller Internet Ressourcer, du vil have at ReactOS skal åbne for dig.", 12289, 36, 11, 182, 18 + LTEXT "&Åbn:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 160, 63, 59, 14, WS_TABSTOP + PUSHBUTTON "Fortryd", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP + PUSHBUTTON "&Gennemse...", 12288, 160, 63, 59, 14, WS_TABSTOP END SHELL_GENERAL_SHORTCUT_DLG DIALOGEX 0, 0, 235, 215 @@ -219,6 +207,7 @@ AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END + SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -366,7 +355,7 @@ LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 LTEXT "File: ", 14001, 44, 25, 188, 10 GROUPBOX "&Programs", -1, 7, 42, 249, 187 - LISTBOX 14002, 16 ,57, 230, 130, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP, WS_EX_STATICEDGE + LISTBOX 14002, 16 ,57, 230, 130, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,WS_EX_STATICEDGE AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 PUSHBUTTON "OK", 14005, 150, 236, 50, 14 @@ -417,7 +406,7 @@ BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 -PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP +PUSHBUTTON "&Ny", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 LTEXT "Opens with:", -1, 12, 140, 40, 10 @@ -594,15 +583,15 @@ STRINGTABLE DISCARDABLE BEGIN /* columns in the shellview */ - IDS_SHV_COLUMN1 "File" - IDS_SHV_COLUMN2 "Size" + IDS_SHV_COLUMN1 "Fil" + IDS_SHV_COLUMN2 "Størrelse" IDS_SHV_COLUMN3 "Type" - IDS_SHV_COLUMN4 "Modified" - IDS_SHV_COLUMN5 "Attributes" - IDS_SHV_COLUMN6 "Size" - IDS_SHV_COLUMN7 "Size available" - IDS_SHV_COLUMN8 "Name" - IDS_SHV_COLUMN9 "Comments" + IDS_SHV_COLUMN4 "Ændret" + IDS_SHV_COLUMN5 "Attributer" + IDS_SHV_COLUMN6 "Størrelse" + IDS_SHV_COLUMN7 "Størrelse tilgængelig" + IDS_SHV_COLUMN8 "Navn" + IDS_SHV_COLUMN9 "Kommentar" IDS_SHV_COLUMN10 "Owner" IDS_SHV_COLUMN11 "Group" IDS_SHV_COLUMN12 "Filename" @@ -619,19 +608,19 @@ IDS_SHV_COLUMN_MODEL "Model" /* special folders */ - IDS_DESKTOP "Desktop" - IDS_MYCOMPUTER "My Computer" + IDS_DESKTOP "Skrivebord" + IDS_MYCOMPUTER "Min Computer" IDS_RECYCLEBIN_FOLDER_NAME "Trash" IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" /* context menus */ - IDS_VIEW_LARGE "Lar&ge Icons" - IDS_VIEW_SMALL "S&mall Icons" - IDS_VIEW_LIST "&List" - IDS_VIEW_DETAILS "&Details" - IDS_SELECT "Select" - IDS_OPEN "Open" + IDS_VIEW_LARGE "Sto&re Ikoner" + IDS_VIEW_SMALL "S&må Ikoner" + IDS_VIEW_LIST "&Liste" + IDS_VIEW_DETAILS "&Detaljer" + IDS_SELECT "Vælg" + IDS_OPEN "Åbn" IDS_CREATELINK "Create &Link" IDS_COPY "Copy" IDS_DELETE "Delete" @@ -642,61 +631,61 @@ IDS_RENAME "Rename" IDS_INSERT "Insert" - IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." - IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" - IDS_DELETEITEM_CAPTION "Confirm file deletion" - IDS_DELETEFOLDER_CAPTION "Confirm folder deletion" - IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" + IDS_CREATEFOLDER_DENIED "Kan ikke oprette ny mappe: Tilladelse Afvist." + IDS_CREATEFOLDER_CAPTION "Fejl ved oprettelse ad ny mappe" + IDS_DELETEITEM_CAPTION "Bekræft sletning af fil" + IDS_DELETEFOLDER_CAPTION "Bekræft sletning af mappe" + IDS_DELETEITEM_TEXT "Er du sikker på du vil slette '%1'?" IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Trash?" IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Trash?" IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Trash?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" - IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" - IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" + IDS_OVERWRITEFILE_TEXT "Overskriv fil %1?" + IDS_OVERWRITEFILE_CAPTION "Bekræft overskrivelse af fil" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ "If the files in the destination folder have the same names as files in the\n"\ "selected folder they will be replaced. Do you still want to move or copy\n"\ "the folder?" /* message box strings */ - IDS_RESTART_TITLE "Restart" - IDS_RESTART_PROMPT "Do you want to restart the system?" - IDS_SHUTDOWN_TITLE "Shutdown" - IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" + IDS_RESTART_TITLE "Genstart" + IDS_RESTART_PROMPT "Ønsker du at Genstarte Systemet?" + IDS_SHUTDOWN_TITLE "Luk Ned" + IDS_SHUTDOWN_PROMPT "Ønsker du at Lukke Ned?" /* shell folder path default values */ - IDS_PROGRAMS "Start Menu\\Programs" - IDS_PERSONAL "My Documents" - IDS_FAVORITES "Favorites" - IDS_STARTUP "Start Menu\\Programs\\StartUp" - IDS_RECENT "Recent" - IDS_SENDTO "SendTo" + IDS_PROGRAMS "Start Menu\\Programmer" + IDS_PERSONAL "Mine Dokumenter" + IDS_FAVORITES "Favoritter" + IDS_STARTUP "Start Menu\\Programer\\Opstart" + IDS_RECENT "Midlertidige" + IDS_SENDTO "Send Til" IDS_STARTMENU "Start Menu" - IDS_MYMUSIC "My Music" - IDS_MYVIDEO "My Videos" - IDS_DESKTOPDIRECTORY "Desktop" + IDS_MYMUSIC "Mine Dokumenter\\Min Musik" + IDS_MYVIDEO "Mine Dokumenter\\Mine Videoer" + IDS_DESKTOPDIRECTORY "Skrivebord" IDS_NETHOOD "NetHood" - IDS_TEMPLATES "Templates" + IDS_TEMPLATES "Skabeloner" IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" - IDS_LOCAL_APPDATA "Local Settings\\Application Data" - IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" + IDS_LOCAL_APPDATA "Lokale Indstillinger\\Application Data" + IDS_INTERNET_CACHE "Midlertidige Internet Filer" IDS_COOKIES "Cookies" - IDS_HISTORY "Local Settings\\History" - IDS_PROGRAM_FILES "Program Files" - IDS_MYPICTURES "My Pictures" - IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" - IDS_COMMON_DOCUMENTS "Documents" - IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" - IDS_COMMON_MUSIC "Documents\\My Music" - IDS_COMMON_PICTURES "Documents\\My Pictures" - IDS_COMMON_VIDEO "Documents\\My Videos" - IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_HISTORY "Historie" + IDS_PROGRAM_FILES "Programmer" + IDS_MYPICTURES "Mine Dokumenter\\Mine Billeder" + IDS_PROGRAM_FILES_COMMON "Programmer\\Fælles Filer" + IDS_COMMON_DOCUMENTS "Dokumenter" + IDS_ADMINTOOLS "Start Menu\\Programmer\\Administrative Værktøjer" + IDS_COMMON_MUSIC "Dokumenter\\Min Musik" + IDS_COMMON_PICTURES "Dokumenter\\Mine Billeder" + IDS_COMMON_VIDEO "Dokumenter\\Mine Videoer" + IDS_CDBURN_AREA "Lokale Indstillinger\\Application Data\\Microsoft\\CD Brænding" IDS_NETWORKPLACE "My Network Places" - IDS_NEWFOLDER "New Folder" + IDS_NEWFOLDER "Ny Mappe" IDS_DRIVE_FIXED "Local Disk" IDS_DRIVE_CDROM "CDROM" @@ -707,15 +696,15 @@ IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" - FCIDM_SHVIEW_NEW "New" - FCIDM_SHVIEW_NEWFOLDER "New &Folder" - FCIDM_SHVIEW_NEWLINK "New &Link" + FCIDM_SHVIEW_NEW "Ny" + FCIDM_SHVIEW_NEWFOLDER "Ny &Mappe" + FCIDM_SHVIEW_NEWLINK "Nyt &Link" IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" Added: trunk/reactos/dll/win32/userenv/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/da-DK.rc (added) +++ trunk/reactos/dll/win32/userenv/lang/da-DK.rc [iso-8859-1] Sat May 2 03:54:31 2009 @@ -1,0 +1,30 @@ +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_PROFILEPATH "%SystemDrive%\\Lokale Indstillinger" + IDS_APPDATA "Application Data" + IDS_DESKTOP "Skrivebord" + IDS_FAVORITES "Favoritter" + IDS_STARTMENU "Start Menu" + IDS_PROGRAMS "Start Menu\\Programmer" + IDS_ADMINTOOLS "Start Menu\\Programmer\\Administrative Værktøjer" + IDS_STARTUP "Start Menu\\Programmer\\Opstart" + IDS_MYDOCUMENTS "Mine Dokumenter" + IDS_MYPICTURES "Mine Dokumenter\\Mine Billeder" + IDS_MYMUSIC "Mine Dokumenter\\Min Musik" + IDS_MYVIDEOS "Mine Dokumenter\\Mine Videoer" + IDS_TEMPLATES "Skabeloner" + IDS_RECENT "Midlertidige" + IDS_SENDTO "Send Til" + IDS_PRINTHOOD "PrintHood" + IDS_NETHOOD "NetHood" + IDS_LOCALSETTINGS "Lokale Indstillinger" + IDS_LOCALAPPDATA "Lokale Indstillinger\\Application Data" + IDS_TEMP "Lokale Indstillinger\\Temp" + IDS_CACHE "Lokale Indstillinger\\Midlertidige Internet Filer" + IDS_HISTORY "Lokale Indstillinger\\Historie" + IDS_COOKIES "Cookies" + IDS_PROGRAMFILES "%SystemDrive%\\Programmer" + IDS_COMMONFILES "Common Files" +END Propchange: trunk/reactos/dll/win32/userenv/lang/da-DK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/userenv/userenv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… ============================================================================== --- trunk/reactos/dll/win32/userenv/userenv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/userenv.rc [iso-8859-1] Sat May 2 03:54:31 2009 @@ -38,6 +38,7 @@ #include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" +#include "lang/da-DK.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc"

15 years, 4 months

[dgorbachev] 40768: - Update log2lines tool by J. Roeloffzen. Bug #4342. - Move it to where raddr2line lives now.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sat May 2 03:34:50 2009 New Revision: 40768 URL: http://svn.reactos.org/svn/reactos?rev=40768&view=rev Log: - Update log2lines tool by J. Roeloffzen. Bug #4342. - Move it to where raddr2line lives now. Added: trunk/reactos/tools/rsym/log2lines.c (contents, props changed) - copied, changed from r40766, trunk/reactos/tools/log2lines.c trunk/reactos/tools/rsym/log2lines.mak (props changed) - copied unchanged from r40766, trunk/reactos/tools/log2lines.mak Removed: trunk/reactos/tools/log2lines.c trunk/reactos/tools/log2lines.mak Modified: trunk/reactos/tools/tools.mak Removed: trunk/reactos/tools/log2lines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines.c?rev=4076… ============================================================================== --- trunk/reactos/tools/log2lines.c [iso-8859-1] (original) +++ trunk/reactos/tools/log2lines.c (removed) @@ -1,1098 +1,0 @@ -/* - * Usage: log2lines [-cd:fFhmrv] [<exefile> <offset>] - * Try log2lines -h - * - * This is a tool and is compiled using the host compiler, - * i.e. on Linux gcc and not mingw-gcc (cross-compiler). - * Therefore we can't include SDK headers and we have to - * duplicate some definitions here. - * Also note that the internal functions are "old C-style", - * returning an int, where a return of 0 means success and - * non-zero is failure. - */ - -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <getopt.h> - -#include "rsym.h" - -#define LOG2LINES_VERSION "0.6" - -#define INVALID_BASE 0xFFFFFFFFL - -#define DEF_OPT_DIR "output-i386" - -#if defined (__DJGPP__) || defined (__WIN32__) - -#define DEV_NULL "NUL" -#define DOS_PATHS -#define PATH_CHAR '\\' -#define PATH_STR "\\" -#define PATHCMP strcasecmp -#define CP_CMD "copy /Y " -#define DIR_FMT "dir /a:-d /s /b %s > %s" - -#else /* not defined (__DJGPP__) || defined (__WIN32__) */ - -#include <errno.h> -#include <limits.h> - -#define MAX_PATH PATH_MAX -#define DEV_NULL "/dev/null" -#define UNIX_PATHS -#define PATH_CHAR '/' -#define PATH_STR "/" -#define PATHCMP strcmp -#define CP_CMD "cp -f " -#define DIR_FMT "find %s -type f > %s" - -#endif /* not defined (__DJGPP__) || defined (__WIN32__) */ - -#define CP_FMT CP_CMD "%s %s > " DEV_NULL - -#define CMD_7Z "7z" -#define UNZIP_FMT "%s x -y -r %s -o%s > " DEV_NULL -#define UNZIP_FMT_CAB \ -"%s x -y -r %s" PATH_STR "reactos" PATH_STR "reactos.cab -o%s" PATH_STR "reactos" PATH_STR "reactos > " DEV_NULL - -#define LINESIZE 1024 - -struct entry_struct -{ - char *buf; - char *name; - char *path; - size_t ImageBase; - struct entry_struct *pnext; -}; - -typedef struct entry_struct CACHE_ENTRY; - -struct cache_struct -{ - off_t st_size; - CACHE_ENTRY *phead; - CACHE_ENTRY *ptail; -}; - -typedef struct cache_struct CACHE; - -static CACHE cache; - -static char *optchars = "cd:fFhl:mMrvz:"; -static int opt_help = 0; // -h -static int opt_force = 0; // -f -static int opt_exit = 0; // -e -static int opt_verbose = 0; // -v -static int opt_console = 0; // -c -static int opt_mark = 0; // -m -static int opt_Mark = 0; // -M -static int opt_raw = 0; // -r -static char opt_dir[MAX_PATH]; // -d -static char opt_logFile[MAX_PATH]; // -l -static char opt_7z[MAX_PATH]; // -z -static FILE *logFile = NULL; - -static char *cache_name; -static char *tmp_name; - -static char * -basename(char *path) -{ - char *base; - - base = strrchr(path, PATH_CHAR); - if (base) - { - return ++base; - } - return path; -} - -static size_t -fixup_offset(size_t ImageBase, size_t offset) -{ - if (offset >= ImageBase) - offset -= ImageBase; - return offset; -} - -static PIMAGE_SECTION_HEADER -find_rossym_section(PIMAGE_FILE_HEADER PEFileHeader, PIMAGE_SECTION_HEADER PESectionHeaders) -{ - size_t i; - for (i = 0; i < PEFileHeader->NumberOfSections; i++) - { - if (0 == strcmp((char *)PESectionHeaders[i].Name, ".rossym")) - return &PESectionHeaders[i]; - } - return NULL; -} - -static int -find_and_print_offset(void *data, size_t offset, char *toString) -{ - PSYMBOLFILE_HEADER RosSymHeader = (PSYMBOLFILE_HEADER) data; - PROSSYM_ENTRY Entries = (PROSSYM_ENTRY) ((char *)data + RosSymHeader->SymbolsOffset); - char *Strings = (char *)data + RosSymHeader->StringsOffset; - size_t symbols = RosSymHeader->SymbolsLength / sizeof (ROSSYM_ENTRY); - size_t i; - - //if (RosSymHeader->SymbolsOffset) - - for (i = 0; i < symbols; i++) - { - if (Entries[i].Address > offset) - { - if (!i--) - return 1; - else - { - PROSSYM_ENTRY e = &Entries[i]; - if (toString) - { // put in toString if provided - snprintf(toString, LINESIZE, "%s:%u (%s)", - &Strings[e->FileOffset], - (unsigned int)e->SourceLine, - &Strings[e->FunctionOffset]); - return 0; - } - else - { // to stdout - printf("%s:%u (%s)\n", &Strings[e->FileOffset], - (unsigned int)e->SourceLine, - &Strings[e->FunctionOffset]); - return 0; - } - } - } - } - return 1; -} - -static int -process_data(const void *FileData, size_t FileSize, size_t offset, char *toString) -{ - PIMAGE_DOS_HEADER PEDosHeader; - PIMAGE_FILE_HEADER PEFileHeader; - PIMAGE_OPTIONAL_HEADER PEOptHeader; - PIMAGE_SECTION_HEADER PESectionHeaders; - PIMAGE_SECTION_HEADER PERosSymSectionHeader; - size_t ImageBase; - int res; - - /* Check if MZ header exists */ - PEDosHeader = (PIMAGE_DOS_HEADER) FileData; - if (PEDosHeader->e_magic != IMAGE_DOS_MAGIC || PEDosHeader->e_lfanew == 0L) - { - perror("Input file is not a PE image.\n"); - return 1; - } - - /* Locate PE file header */ - /* sizeof(ULONG) = sizeof(MAGIC) */ - PEFileHeader = (PIMAGE_FILE_HEADER) ((char *)FileData + PEDosHeader->e_lfanew + sizeof (ULONG)); - - /* Locate optional header */ - PEOptHeader = (PIMAGE_OPTIONAL_HEADER) (PEFileHeader + 1); - ImageBase = PEOptHeader->ImageBase; - - /* Locate PE section headers */ - PESectionHeaders = (PIMAGE_SECTION_HEADER) ((char *)PEOptHeader + PEFileHeader->SizeOfOptionalHeader); - - /* make sure offset is what we want */ - offset = fixup_offset(ImageBase, offset); - - /* find rossym section */ - PERosSymSectionHeader = find_rossym_section(PEFileHeader, PESectionHeaders); - if (!PERosSymSectionHeader) - { - fprintf(stderr, "Couldn't find rossym section in executable\n"); - return 1; - } - res = find_and_print_offset((char *)FileData + PERosSymSectionHeader->PointerToRawData, offset, toString); - if (res) - { - if (toString) - { - sprintf(toString, "??:0\n"); - } - else - { - printf("??:0\n"); - } - } - - return res; -} - -static long -my_atoi(const char *a) -{ - int i = 0; - const char *fmt = "%x"; - - if (*a == '0') - { - switch (*++a) - { - case 'x': - fmt = "%x"; - ++a; - break; - case 'd': - fmt = "%d"; - ++a; - break; - default: - fmt = "%o"; - break; - } - } - sscanf(a, fmt, &i); - return i; -} - -static int -file_exists(char *name) -{ - FILE *f; - - f = fopen(name, "r"); - if (!f) - { - return 0; - } - fclose(f); - return 1; -} - -static int -process_file(const char *file_name, size_t offset, char *toString) -{ - void *FileData; - size_t FileSize; - int res = 1; - - FileData = load_file(file_name, &FileSize); - if (!FileData) - { - fprintf(stderr, "An error occured loading '%s'\n", file_name); - } - else - { - res = process_data(FileData, FileSize, offset, toString); - free(FileData); - } - return res; -} - -static int -get_ImageBase(char *fname, size_t *ImageBase) -{ - IMAGE_DOS_HEADER PEDosHeader; - IMAGE_FILE_HEADER PEFileHeader; - IMAGE_OPTIONAL_HEADER PEOptHeader; - - FILE *fr; - off_t readLen; - int res; - - *ImageBase = INVALID_BASE; - fr = fopen(fname, "rb"); - if (!fr) - { - if (opt_verbose) - fprintf(stderr, "get_ImageBase, cannot open '%s' (%s)\n", fname, strerror(errno)); - return 1; - } - - readLen = fread(&PEDosHeader, sizeof (IMAGE_DOS_HEADER), 1, fr); - if (1 != readLen) - { - if (opt_verbose) - fprintf(stderr, "get_ImageBase %s, read error IMAGE_DOS_HEADER (%s)\n", fname, strerror(errno)); - fclose(fr); - return 2; - } - - /* Check if MZ header exists */ - if (PEDosHeader.e_magic != IMAGE_DOS_MAGIC || PEDosHeader.e_lfanew == 0L) - { - if (opt_verbose > 1) - fprintf(stderr, "get_ImageBase %s, MZ header missing\n", fname); - fclose(fr); - return 3; - } - - /* Locate PE file header */ - res = fseek(fr, PEDosHeader.e_lfanew + sizeof (ULONG), SEEK_SET); - readLen = fread(&PEFileHeader, sizeof (IMAGE_FILE_HEADER), 1, fr); - if (1 != readLen) - { - if (opt_verbose) - fprintf(stderr, "get_ImageBase %s, read error IMAGE_FILE_HEADER (%s)\n", fname, strerror(errno)); - return 4; - } - - /* Locate optional header */ - readLen = fread(&PEOptHeader, sizeof (IMAGE_OPTIONAL_HEADER), 1, fr); - if (1 != readLen) - { - if (opt_verbose) - fprintf(stderr, "get_ImageBase %s, read error IMAGE_OPTIONAL_HEADER (%s)\n", fname, strerror(errno)); - fclose(fr); - return 5; - } - - /* Check if it's really an IMAGE_OPTIONAL_HEADER we are interested in */ - if ((PEOptHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) && - (PEOptHeader.Magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC)) - { - if (opt_verbose > 1) - fprintf(stderr, "get_ImageBase %s, not an IMAGE_NT_OPTIONAL_HDR<32|64>\n", fname); - fclose(fr); - return 6; - } - - *ImageBase = PEOptHeader.ImageBase; - fclose(fr); - return 0; -} - -static CACHE_ENTRY * -entry_delete(CACHE_ENTRY *pentry) -{ - if (!pentry) - return NULL; - if (pentry->buf) - free(pentry->buf); - free(pentry); - return NULL; -} - -static CACHE_ENTRY * -entry_insert(CACHE_ENTRY *pentry) -{ - if (!pentry) - return NULL; - pentry->pnext = cache.phead; - cache.phead = pentry; - if (!cache.ptail) - cache.ptail = pentry; - return pentry; -} - -#if 0 -static CACHE_ENTRY * -entry_append(CACHE_ENTRY *pentry) -{ - if (!pentry) - return NULL; - if (!cache.ptail) - return entry_insert(pentry); - cache.ptail->pnext = pentry; - pentry->pnext = NULL; - cache.ptail = pentry; - return pentry; -} -#endif - -static CACHE_ENTRY * -entry_create(char *Line) -{ - CACHE_ENTRY *pentry; - char *s = NULL; - int l; - - if (!Line) - return NULL; - - pentry = malloc(sizeof (CACHE_ENTRY)); - if (!pentry) - return NULL; - - l = strlen(Line); - pentry->buf = s = malloc(l + 1); - if (!s) - { - if (opt_verbose) - fprintf(stderr, "Alloc entry failed\n"); - return entry_delete(pentry); - } - - strcpy(s, Line); - if (s[l] == '\n') - s[l] = '\0'; - - pentry->name = s; - s = strchr(s, '|'); - if (!s) - { - if (opt_verbose) - fprintf(stderr, "Name field missing\n"); - return entry_delete(pentry); - } - *s++ = '\0'; - - pentry->path = s; - s = strchr(s, '|'); - if (!s) - { - if (opt_verbose) - fprintf(stderr, "Path field missing\n"); - return entry_delete(pentry); - } - *s++ = '\0'; - if (1 != sscanf(s, "%x", &pentry->ImageBase)) - { - if (opt_verbose) - fprintf(stderr, "ImageBase field missing\n"); - return entry_delete(pentry); - } - return pentry; -} - -static CACHE_ENTRY * -entry_lookup(char *name) -{ - CACHE_ENTRY *pprev = NULL; - CACHE_ENTRY *pnext; - - pnext = cache.phead; - while (pnext != NULL) - { - if (PATHCMP(name, pnext->name) == 0) - { - if (pprev) - { // move to head for faster lookup next time - pprev->pnext = pnext->pnext; - pnext->pnext = cache.phead; - cache.phead = pnext; - } - return pnext; - } - pprev = pnext; - pnext = pnext->pnext; - } - return NULL; -} - -static int -read_cache(void) -{ - FILE *fr; - CACHE_ENTRY *pentry; - char *Line = NULL; - int result = 0; - - //fprintf(stderr, "Reading cache ...\n"); - Line = malloc(LINESIZE + 1); - if (!Line) - { - if (opt_verbose) - fprintf(stderr, "Alloc Line failed\n"); - return 1; - } - Line[LINESIZE] = '\0'; - - fr = fopen(cache_name, "r"); - if (!fr) - { - if (opt_verbose) - fprintf(stderr, "Open %s failed\n", cache_name); - free(Line); - return 2; - } - cache.phead = cache.ptail = NULL; - - while (fgets(Line, LINESIZE, fr) != NULL) - { - pentry = entry_create(Line); - if (!pentry) - { - if (opt_verbose > 1) - fprintf(stderr, "** FAILED: %s\n", Line); - } - else - { - entry_insert(pentry); - } - } - - fclose(fr); - free(Line); - return result; -} - -static int -create_cache(int force, int skipImageBase) -{ - FILE *fr, *fw; - char *Line = NULL, *Fname = NULL; - int len, err; - size_t ImageBase; - - if ((fw = fopen(tmp_name, "w")) == NULL) - { - if (opt_verbose) - fprintf(stderr, "Apparently %s is not writable (mounted ISO?), using current dir\n", tmp_name); - cache_name = basename(cache_name); - tmp_name = basename(tmp_name); - } - else - { - if (opt_verbose > 2) - fprintf(stderr, "%s is writable\n", tmp_name); - fclose(fw); - remove(tmp_name); - } - - if (force) - { - if (opt_verbose > 2) - fprintf(stderr, "Removing %s ...\n", cache_name); - remove(cache_name); - } - else - { - if (file_exists(cache_name)) - { - if (opt_verbose > 2) - fprintf(stderr, "Cache %s already exists\n", cache_name); - return 0; - } - } - - Line = malloc(LINESIZE + 1); - if (!Line) - return 1; - Line[LINESIZE] = '\0'; - - remove(tmp_name); - fprintf(stderr, "Scanning %s ...\n", opt_dir); - snprintf(Line, LINESIZE, DIR_FMT, opt_dir, tmp_name); - system(Line); - fprintf(stderr, "Creating cache ..."); - - if ((fr = fopen(tmp_name, "r")) != NULL) - { - if ((fw = fopen(cache_name, "w")) != NULL) - { - while (fgets(Line, LINESIZE, fr) != NULL) - { - len = strlen(Line); - if (!len) - continue; - - Fname = Line + len - 1; - if (*Fname == '\n') - *Fname = '\0'; - - while ((Fname > Line) && (*Fname != PATH_CHAR)) - Fname--; - if (*Fname == PATH_CHAR) - Fname++; - if (*Fname && !skipImageBase) - { - if ((err = get_ImageBase(Line, &ImageBase)) != 0) - { - if (opt_verbose > 2) - fprintf(stderr, "%s|%s|%0x, ERR=%d\n", Fname, Line, ImageBase, err); - } - else - { - fprintf(fw, "%s|%s|%0x\n", Fname, Line, ImageBase); - } - } - } - fclose(fw); - } - fprintf(stderr, "... done\n"); - fclose(fr); - } - remove(tmp_name); - free(Line); - return 0; -} - -static int -translate_file(const char *cpath, size_t offset, char *toString) -{ - size_t base = 0; - CACHE_ENTRY *pentry = NULL; - int res = 0; - char *path, *dpath; - - /* First get the ImageBase of the File. If its smaller than the given - * Parameter, everything is ok, because it was already added onto the - * adress and can be given directly to process_file. If not, add it and - * give the result to process_file. - */ - dpath = path = convert_path(cpath); - if (!path) - { - return 1; - } - - // The path could be absolute: - if (get_ImageBase(path, &base)) - { - pentry = entry_lookup(path); - if (pentry) - { - path = pentry->path; - base = pentry->ImageBase; - if (base == INVALID_BASE) - { - if (opt_verbose) - fprintf(stderr, "No, or invalid base address: %s\n", path); - res = 2; - } - } - else - { - if (opt_verbose) - fprintf(stderr, "Not found in cache: %s\n", path); - res = 3; - } - } - - if (!res) - { - offset = (base < offset) ? offset : base + offset; - res = process_file(path, offset, toString); - } - - free(dpath); - return res; -} - -static void -translate_char(int c, FILE *outFile) -{ - fputc(c, outFile); - if (logFile) - fputc(c, logFile); -} - -static void -translate_line(FILE *outFile, char *Line, char *path, char *LineOut) -{ - size_t offset; - int cnt, res; - char *sep, *tail, *mark; - unsigned char ch; - - if (!*Line) - return; - res = 1; - mark = ""; - sep = strchr(Line, ':'); - if (sep) - { - *sep = ' '; - cnt = sscanf(Line, "<%s %x%c", path, &offset, &ch); - if (cnt == 3 && ch == '>') - { - tail = strchr(Line, '>') + 1; - if (!(res = translate_file(path, offset, LineOut))) - { - mark = opt_mark ? "* " : ""; - fprintf(outFile, "%s<%s:%x (%s)>%s", mark, path, offset, LineOut, tail); - if (logFile) - fprintf(logFile, "%s<%s:%x (%s)>%s", mark, path, offset, LineOut, tail); - } - else - { - *sep = ':'; // restore because not translated - mark = opt_Mark ? "? " : ""; - } - } - } - if (res) - { - fprintf(outFile, "%s%s", mark, Line); // just copy - if (logFile) - fprintf(logFile, "%s%s", mark, Line); // just copy - } - memset(Line, '\0', LINESIZE); // flushed -} - -static int -translate_files(FILE * inFile, FILE * outFile) -{ - char *Line = malloc(LINESIZE + 1); - char *path = malloc(LINESIZE + 1); - char *LineOut = malloc(LINESIZE + 1); - int c; - unsigned char ch; - int i = 0; - - if (Line && path && LineOut) - { - memset(Line, '\0', LINESIZE + 1); - if (opt_console) - { - while ((c = fgetc(inFile)) != EOF) - { - ch = (unsigned char)c; - if (!opt_raw) - { - switch (ch) - { - case '\n': - translate_line(outFile, Line, path, LineOut); - i = 0; - translate_char(c, outFile); - break; - case '<': - i = 0; - Line[i++] = ch; - break; - case '>': - if (i) - { - if (i < LINESIZE) - { - Line[i++] = ch; - translate_line(outFile, Line, path, LineOut); - } - else - { - translate_line(outFile, Line, path, LineOut); - translate_char(c, outFile); - } - i = 0; - } - else - { - translate_char(c, outFile); - } - i = 0; - break; - default: - if (i) - { - if (i < LINESIZE) - { - Line[i++] = ch; - } - else - { - translate_line(outFile, Line, path, LineOut); - translate_char(c, outFile); - i = 0; - } - } - else - { - translate_char(c, outFile); - } - } - } - else - { - translate_char(c, outFile); - } - } - } - else - { // Line by line, slightly faster but less interactive - while (fgets(Line, LINESIZE, inFile) != NULL) - { - if (!opt_raw) - { - translate_line(outFile, Line, path, LineOut); - } - else - { - fprintf(outFile, "%s", Line); // just copy - if (logFile) - fprintf(logFile, "%s", Line); // just copy - } - } - } - } - free(LineOut); - free(Line); - free(path); - return 0; -} - -static char *verboseUsage = -"\n" -"Description:\n" -" When <exefile> <offset> are given, log2lines works just like raddr2line\n" -" Otherwise it reads stdin and tries to translate lines of the form:\n" -" <IMAGENAME:ADDRESS>\n\n" -" The result is written to stdout.\n" -" log2lines uses a cache in order to avoid a directory scan at each\n" -" image lookup, greatly increasing performance. Only image path and its\n" -" base address are cached.\n\n" -"Options:\n" -" -c Console mode. Outputs text per character instead of per line.\n" -" This is slightly slower but enables to see what you type.\n\n" -" -d <directory>|<ISO image>\n" -" Directory to scan for images. (Do not append a '" PATH_STR "')\n" -" This option also takes an ISO image as argument:\n" -" - The image is recognized by the '.iso' extension.\n" -" - The image will be unpacked to a directory with the same name.\n" -" - The embedded reactos.cab file will also be unpacked.\n" -" - Combined with -f the file will be re-unpacked.\n" -" - NOTE: this ISO unpack feature needs 7z to be in the PATH.\n" -" Default: " DEF_OPT_DIR "\n\n" -" -f Force creating new cache.\n\n" -" -F As -f but exits immediately after creating cache.\n\n" -" -h This text.\n\n" -" -l <logFile>\n" -" Append copy to specified logFile.\n" -" Default: no logFile\n\n" -" -m Prefix (mark) each translated line with '* '.\n\n" -" -M Prefix (mark) each NOT translated line with '? '.\n" -" ( Only for lines of the form: <IMAGENAME:ADDRESS> )\n\n" -" -r Raw output without translation.\n\n" -" -v Show detailed errors and tracing.\n" -" Repeating this option adds more verbosity.\n" -" Default: only (major) errors\n" "\n" -" -z <path to 7z>\n" -" Specify path to 7z.\n" -" Default: '7z'\n" -"\n" -"Examples:\n" -" Setup is a VMware machine with its serial port set to: '\\\\.\\pipe\\kdbg'.\n\n" -" Just recreate cache after a svn update or a new module has been added:\n" -" log2lines -F\n\n" " Use kdbg debugger via console (interactive):\n" -" log2lines -c < \\\\.\\pipe\\kdbg\n\n" -" Use kdbg debugger via console, and append copy to logFile:\n" -" log2lines -c -l dbg.log < \\\\.\\pipe\\kdbg\n\n" -" Use kdbg debugger to send output to logfile:\n" -" log2lines < \\\\.\\pipe\\kdbg > dbg.log\n\n" -" Re-translate a debug log:\n" -" log2lines -d bootcd-38701-dbg.iso < bugxxxx.log\n\n" -"\n"; - -static void -usage(int verbose) -{ - fprintf(stderr, "log2lines " LOG2LINES_VERSION "\n\n"); - fprintf(stderr, "Usage: log2lines [-%s] [<exefile> <offset>]\n", optchars); - if (verbose) - { - fprintf(stderr, verboseUsage); - } - else - { - fprintf(stderr, "Try log2lines -h\n"); - } -} - -static int -unpack_iso(char *dir, char *iso) -{ - char Line[LINESIZE]; - int res = 0; - char iso_tmp[MAX_PATH]; - int iso_copied = 0; - FILE *fiso; - - strcpy(iso_tmp, iso); - if ((fiso = fopen(iso, "a")) == NULL) - { - if (opt_verbose) - fprintf(stderr, "Open of %s failed (locked), trying to copy first\n", iso); - - strcat(iso_tmp,"~"); - remove(iso_tmp); - sprintf(Line, CP_FMT, iso, iso_tmp); - if (opt_verbose > 1) - fprintf(stderr, "Executing: %s\n", Line); - system(Line); - iso_copied = 1; - } - else - { - fclose(fiso); - } - - sprintf(Line, UNZIP_FMT, opt_7z, iso_tmp, dir); - if (system(Line) < 0) - { - fprintf(stderr, "\nCannot unpack %s (check 7z path!)\n", iso_tmp); - if (opt_verbose) - fprintf(stderr, "Failed to execute: '%s'\n", Line); - res = 1; - } - else - { - if (opt_verbose > 1) - fprintf(stderr, "\nUnpacking reactos.cab in %s\n", dir); - sprintf(Line, UNZIP_FMT_CAB, opt_7z, dir, dir); - if (system(Line) < 0) - { - fprintf(stderr, "\nCannot unpack reactos.cab in %s\n", dir); - if (opt_verbose) - fprintf(stderr, "Failed to execute: '%s'\n", Line); - res = 2; - } - } - if (iso_copied) - { - remove(iso_tmp); - } - return res; -} - -static int -check_directory(int force) -{ - char freeldr_path[MAX_PATH]; - char iso_path[MAX_PATH]; - - char *check_iso = strrchr(opt_dir, '.'); - if (check_iso && PATHCMP(check_iso, ".iso") == 0) - { - if (opt_verbose) - fprintf(stderr, "Using ISO image: %s\n", opt_dir); - if (file_exists(opt_dir)) - { - if (opt_verbose > 1) - fprintf(stderr, "ISO image exists: %s\n", opt_dir); - - strcpy(iso_path, opt_dir); - *check_iso = '\0'; - sprintf(freeldr_path, "%s" PATH_STR "freeldr.ini", opt_dir); - if (!file_exists(freeldr_path) || force) - { - fprintf(stderr, "Unpacking %s to: %s ...", iso_path, opt_dir); - unpack_iso(opt_dir, iso_path); - fprintf(stderr, "... done\n"); - } - else - { - if (opt_verbose > 1) - fprintf(stderr, "%s already unpacked in: %s\n", iso_path, opt_dir); - } - } - else - { - fprintf(stderr, "ISO image not found: %s\n", opt_dir); - return 1; - } - } - cache_name = malloc(MAX_PATH); - tmp_name = malloc(MAX_PATH); - strcpy(cache_name, opt_dir); - strcat(cache_name, PATH_STR "log2lines.cache"); - strcpy(tmp_name, cache_name); - strcat(tmp_name, "~"); - return 0; -} - -int -main(int argc, const char **argv) -{ - int res = 0; - int opt; - int optCount = 0; - - strcpy(opt_dir, DEF_OPT_DIR); - strcpy(opt_logFile, ""); - strcpy(opt_7z, CMD_7Z); - while (-1 != (opt = getopt(argc, (char **const)argv, optchars))) - { - switch (opt) - { - case 'c': - opt_console++; - break; - case 'd': - optCount++; - strcpy(opt_dir, optarg); - break; - case 'f': - opt_force++; - break; - case 'h': - opt_help++; - usage(1); - exit(0); - break; - case 'F': - opt_exit++; - opt_force++; - break; - case 'l': - optCount++; - strcpy(opt_logFile, optarg); - break; - case 'm': - opt_mark++; - break; - case 'M': - opt_Mark++; - break; - case 'r': - opt_raw++; - break; - case 'v': - opt_verbose++; - break; - case 'z': - optCount++; - strcpy(opt_7z, optarg); - break; - default: - usage(0); - exit(2); - break; - } - optCount++; - } - - argc -= optCount; - if (argc != 1 && argc != 3) - { - usage(0); - exit(1); - } - - if (check_directory(opt_force)) - exit(3); - - create_cache(opt_force, 0); - if (opt_exit) - exit(0); - - read_cache(); - - if (*opt_logFile) - { - logFile = fopen(opt_logFile, "a"); - if (logFile) - { - // disable buffering so fflush is not needed - setbuf(logFile,NULL); - } - else - { - fprintf(stderr, "Could not open logfile %s (%s)\n", opt_logFile, strerror(errno)); - exit(2); - - } - } - if (argc == 3) - { // translate <exefile> <offset> - translate_file(argv[optCount + 1], my_atoi(argv[optCount + 2]), NULL); - } - else - { // translate logging from stdin - translate_files(stdin, stdout); - } - - if (logFile) - fclose(logFile); - return res; -} Removed: trunk/reactos/tools/log2lines.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines.mak?rev=40… ============================================================================== --- trunk/reactos/tools/log2lines.mak [iso-8859-1] (original) +++ trunk/reactos/tools/log2lines.mak (removed) @@ -1,41 +1,0 @@ -LOG2LINES_BASE = $(TOOLS_BASE) -LOG2LINES_BASE_ = $(LOG2LINES_BASE)$(SEP) - -LOG2LINES_INT = $(INTERMEDIATE_)$(LOG2LINES_BASE) -LOG2LINES_INT_ = $(LOG2LINES_INT)$(SEP) -LOG2LINES_OUT = $(OUTPUT_)$(LOG2LINES_BASE) -LOG2LINES_OUT_ = $(LOG2LINES_OUT)$(SEP) - -LOG2LINES_TARGET = \ - $(LOG2LINES_OUT_)log2lines$(EXEPOSTFIX) - -LOG2LINES_SOURCES = \ - $(LOG2LINES_BASE_)log2lines.c \ - $(LOG2LINES_BASE_)rsym_common.c - -LOG2LINES_OBJECTS = \ - $(addprefix $(INTERMEDIATE_), $(LOG2LINES_SOURCES:.c=.o)) - -LOG2LINES_HOST_CFLAGS = $(TOOLS_CFLAGS) - -LOG2LINES_HOST_LFLAGS = $(TOOLS_LFLAGS) - -.PHONY: log2lines -log2lines: $(LOG2LINES_TARGET) - -$(LOG2LINES_TARGET): $(LOG2LINES_OBJECTS) | $(LOG2LINES_OUT) - $(ECHO_HOSTLD) - ${host_gcc} $(LOG2LINES_OBJECTS) $(LOG2LINES_HOST_LFLAGS) -o $@ - -$(LOG2LINES_INT_)log2lines.o: $(LOG2LINES_BASE_)log2lines.c | $(LOG2LINES_INT) - $(ECHO_HOSTCC) - ${host_gcc} $(LOG2LINES_HOST_CFLAGS) -c $< -o $@ - -#$(LOG2LINES_INT_)rsym_common.o: $(LOG2LINES_BASE_)rsym_common.c | $(LOG2LINES_INT) -# $(ECHO_HOSTCC) -# ${host_gcc} $(LOG2LINES_HOST_CFLAGS) -c $< -o $@ - -.PHONY: log2lines_clean -log2lines_clean: - -@$(rm) $(LOG2LINES_TARGET) $(LOG2LINES_OBJECTS) 2>$(NUL) -clean: log2lines_clean Copied: trunk/reactos/tools/rsym/log2lines.c (from r40766, trunk/reactos/tools/log2lines.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/log2lines.c?p2=… ============================================================================== --- trunk/reactos/tools/log2lines.c [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/log2lines.c [iso-8859-1] Sat May 2 03:34:50 2009 @@ -18,7 +18,7 @@ #include "rsym.h" -#define LOG2LINES_VERSION "0.6" +#define LOG2LINES_VERSION "0.8" #define INVALID_BASE 0xFFFFFFFFL @@ -44,7 +44,7 @@ #define UNIX_PATHS #define PATH_CHAR '/' #define PATH_STR "/" -#define PATHCMP strcmp +#define PATHCMP strcasecmp #define CP_CMD "cp -f " #define DIR_FMT "find %s -type f > %s" @@ -81,7 +81,8 @@ static CACHE cache; -static char *optchars = "cd:fFhl:mMrvz:"; +static char *optchars = "bcd:fFhl:mMrvz:"; +static int opt_buffered= 0; // -b static int opt_help = 0; // -h static int opt_force = 0; // -f static int opt_exit = 0; // -e @@ -267,6 +268,29 @@ } fclose(f); return 1; +} + +static int +copy_file(char *src, char *dst) +{ + char Line[LINESIZE]; + + sprintf(Line, CP_FMT, src, dst); + if (opt_verbose > 1) + fprintf(stderr, "Executing: %s\n", Line); + remove(dst); + if (file_exists(dst)) + { + fprintf(stderr, "Cannot remove dst %s before copy\n", dst); + return 1; + } + system(Line); + if (!file_exists(dst)) + { + fprintf(stderr, "Dst %s does not exist after copy \n", dst); + return 2; + } + return 0; } static int @@ -833,6 +857,8 @@ " image lookup, greatly increasing performance. Only image path and its\n" " base address are cached.\n\n" "Options:\n" +" -b Use this combined with '-l'. Enable buffering on logFile.\n" +" This may solve loosing output on real hardware.\n\n" " -c Console mode. Outputs text per character instead of per line.\n" " This is slightly slower but enables to see what you type.\n\n" " -d <directory>|<ISO image>\n" @@ -881,7 +907,7 @@ fprintf(stderr, "Usage: log2lines [-%s] [<exefile> <offset>]\n", optchars); if (verbose) { - fprintf(stderr, verboseUsage); + fprintf(stderr, "%s", verboseUsage); } else { @@ -902,14 +928,11 @@ if ((fiso = fopen(iso, "a")) == NULL) { if (opt_verbose) - fprintf(stderr, "Open of %s failed (locked), trying to copy first\n", iso); + fprintf(stderr, "Open of %s failed (locked for writing?), trying to copy first\n", iso); strcat(iso_tmp,"~"); - remove(iso_tmp); - sprintf(Line, CP_FMT, iso, iso_tmp); - if (opt_verbose > 1) - fprintf(stderr, "Executing: %s\n", Line); - system(Line); + if (copy_file(iso,iso_tmp)) + return 3; iso_copied = 1; } else @@ -1005,6 +1028,9 @@ { switch (opt) { + case 'b': + opt_buffered++; + break; case 'c': opt_console++; break; @@ -1074,7 +1100,17 @@ if (logFile) { // disable buffering so fflush is not needed - setbuf(logFile,NULL); + if (!opt_buffered) + { + if (opt_verbose) + fprintf(stderr, "Disabling log buffering on %s\n", opt_logFile); + setbuf(logFile,NULL); + } + else + { + if (opt_verbose) + fprintf(stderr, "Enabling log buffering on %s\n", opt_logFile); + } } else { Propchange: trunk/reactos/tools/rsym/log2lines.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/rsym/log2lines.c ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/tools/rsym/log2lines.mak ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/rsym/log2lines.mak ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=40768&… ============================================================================== --- trunk/reactos/tools/tools.mak [iso-8859-1] (original) +++ trunk/reactos/tools/tools.mak [iso-8859-1] Sat May 2 03:34:50 2009 @@ -43,7 +43,7 @@ include tools/bin2c.mak include tools/buildno/buildno.mak include tools/gendib/gendib.mak -include tools/log2lines.mak +include tools/rsym/log2lines.mak include tools/nci/nci.mak ifeq ($(ARCH),powerpc) include tools/ofw_interface/ofw_interface.mak

15 years, 4 months

[dreimer] 40767: Hopefully fixed the shortcuts in the Installer. Modified the Path Variable to be not overwritten. Now it stays but is being extended. Readded LIBRARY_PATH to fix some problems. (Thx to DerSani from the German Chat)

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat May 2 02:42:09 2009 New Revision: 40767 URL: http://svn.reactos.org/svn/reactos?rev=40767&view=rev Log: Hopefully fixed the shortcuts in the Installer. Modified the Path Variable to be not overwritten. Now it stays but is being extended. Readded LIBRARY_PATH to fix some problems. (Thx to DerSani from the German Chat) Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Sat May 2 02:42:09 2009 @@ -18,7 +18,6 @@ if ($ENV:APPDATA.Length -lt 1) { $ENV:APPDATA = $ENV:USERPROFILE } -$ENV:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot" $global:_ROSBE_VERSION = 1.4.2 $global:0 = $myInvocation.MyCommand.Definition $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Sat May 2 02:42:09 2009 @@ -67,7 +67,6 @@ # $ENV:PATH = "$_ROSBE_HOST_MINGWPATH\bin;$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" $global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe" -$ENV:LIBRARY_PATH = $null if ($ENV:ROS_ARCH -ne $null) { & "$ENV:ROS_PREFIX-gcc" -v 2> gcctvers.tmp @@ -111,3 +110,5 @@ $ENV:ROSBE_TARGET_CFLAGS = $null $ENV:ROSBE_TARGET_CXXFLAGS = $null } + +ENV:LIBRARY_PATH = "$_ROSBE_HOST_MINGWPATH\lib;$_ROSBE_HOST_MINGWPATH\lib\gcc\mingw32\$_ROSBE_GCCVERSION" Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Sat May 2 02:42:09 2009 @@ -20,7 +20,6 @@ :: the options utility. :: if not defined APPDATA set APPDATA=%USERPROFILE% -set PATH=%SystemRoot%\system32;%SystemRoot% set _ROSBE_VERSION=1.4.2 set _ROSBE_BASEDIR=%~dp0 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Sat May 2 02:42:09 2009 @@ -72,7 +72,6 @@ set PATH=%_ROSBE_HOST_MINGWPATH%\bin;%_ROSBE_TARGET_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe -set LIBRARY_PATH= if not .%ROS_ARCH%. == .. ( for /f "usebackq tokens=3" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i @@ -114,6 +113,8 @@ set ROSBE_TARGET_CXXFLAGS= ) +set LIBRARY_PATH=%_ROSBE_HOST_MINGWPATH%\lib;%_ROSBE_HOST_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION% + :: HAX !!!! set HOST_CFLAGS=%ROSBE_HOST_CFLAGS% set HOST_CPPFLAGS=%ROSBE_HOST_CXXFLAGS% Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Sat May 2 02:42:09 2009 @@ -283,7 +283,7 @@ SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" '-noexit &"$INSTDIR\RosBE.ps1"' "$INSTDIR\rosbe.ico" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" SetOutPath $PROFILE CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" SetOutPath $INSTDIR @@ -304,7 +304,7 @@ SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$DESKTOP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" '-noexit &"$INSTDIR\RosBE.ps1"' "$INSTDIR\rosbe.ico" + CreateShortCut "$DESKTOP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" SetOutPath $PROFILE CreateShortCut "$DESKTOP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" SectionEnd @@ -319,7 +319,7 @@ SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" '-noexit &"$INSTDIR\RosBE.ps1"' "$INSTDIR\rosbe.ico" + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" SetOutPath $PROFILE CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" SectionEnd

15 years, 4 months

[dgoette] 398: forgot this once

by dgoette＠svn.reactos.org

Author: dgoette Date: Sat May 2 02:32:48 2009 New Revision: 398 URL: http://svn.reactos.org/svn/reactos?rev=398&view=rev Log: forgot this once Added: branches/danny-web/www/www.reactos.org/roscms/images/submit.png (with props) Added: branches/danny-web/www/www.reactos.org/roscms/images/submit.png URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== Binary file - no diff available. Propchange: branches/danny-web/www/www.reactos.org/roscms/images/submit.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

15 years, 4 months

[dgoette] 397: toolbar icon collection, based on tango by Mariusz Przybylski

by dgoette＠svn.reactos.org

Author: dgoette Date: Sat May 2 02:26:39 2009 New Revision: 397 URL: http://svn.reactos.org/svn/reactos?rev=397&view=rev Log: toolbar icon collection, based on tango by Mariusz Przybylski Added: branches/danny-web/www/www.reactos.org/roscms/images/archive.png (with props) branches/danny-web/www/www.reactos.org/roscms/images/compare.png (with props) branches/danny-web/www/www.reactos.org/roscms/images/delete.png (with props) branches/danny-web/www/www.reactos.org/roscms/images/new.png (with props) branches/danny-web/www/www.reactos.org/roscms/images/preview.png (with props) branches/danny-web/www/www.reactos.org/roscms/images/publish.png (with props) branches/danny-web/www/www.reactos.org/roscms/images/refresh.png (with props) Added: branches/danny-web/www/www.reactos.org/roscms/images/archive.png URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== Binary file - no diff available. Propchange: branches/danny-web/www/www.reactos.org/roscms/images/archive.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/danny-web/www/www.reactos.org/roscms/images/compare.png URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== Binary file - no diff available. Propchange: branches/danny-web/www/www.reactos.org/roscms/images/compare.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/danny-web/www/www.reactos.org/roscms/images/delete.png URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== Binary file - no diff available. Propchange: branches/danny-web/www/www.reactos.org/roscms/images/delete.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/danny-web/www/www.reactos.org/roscms/images/new.png URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== Binary file - no diff available. Propchange: branches/danny-web/www/www.reactos.org/roscms/images/new.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/danny-web/www/www.reactos.org/roscms/images/preview.png URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== Binary file - no diff available. Propchange: branches/danny-web/www/www.reactos.org/roscms/images/preview.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/danny-web/www/www.reactos.org/roscms/images/publish.png URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== Binary file - no diff available. Propchange: branches/danny-web/www/www.reactos.org/roscms/images/publish.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/danny-web/www/www.reactos.org/roscms/images/refresh.png URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== Binary file - no diff available. Propchange: branches/danny-web/www/www.reactos.org/roscms/images/refresh.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

15 years, 4 months

[mjmartin] 40766: - Add reg key tree NetworkProvider under CurrentControlSet\Control\. For now differ from windows by using an empty string for ProviderOrder value. Fixes bug #3987.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sat May 2 02:08:45 2009 New Revision: 40766 URL: http://svn.reactos.org/svn/reactos?rev=40766&view=rev Log: - Add reg key tree NetworkProvider under CurrentControlSet\Control\. For now differ from windows by using an empty string for ProviderOrder value. Fixes bug #3987. Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Sat May 2 02:08:45 2009 @@ -378,6 +378,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E974-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"NetService" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Protocol" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"NetTrans" +HKLM,"SYSTEM\CurrentControlSet\Control\NetworkProvider\Order","ProviderOrder",0x00000000,"" ; NLS Files HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","37",0x00000000,"c_037.nls" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat May 2 02:08:45 2009 @@ -378,6 +378,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E974-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"NetService" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Protocol" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"NetTrans" +HKLM,"SYSTEM\CurrentControlSet\Control\NetworkProvider\Order","ProviderOrder",0x00000000,"" ; NLS Files HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","37",0x00000000,"c_037.nls"

15 years, 4 months

[dgoette] 396: fix some layout issues spotted by colin

by dgoette＠svn.reactos.org

Author: dgoette Date: Sat May 2 01:40:11 2009 New Revision: 396 URL: http://svn.reactos.org/svn/reactos?rev=396&view=rev Log: fix some layout issues spotted by colin Modified: branches/danny-web/www/www.reactos.org/roscms/css/user.css branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js branches/danny-web/www/www.reactos.org/roscms/lib/HTML_User.class.php Modified: branches/danny-web/www/www.reactos.org/roscms/css/user.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/css/user.css [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/css/user.css [iso-8859-1] Sat May 2 01:40:11 2009 @@ -25,7 +25,7 @@ /* left menu */ #leftNav { padding: 0px 10px 10px 10px; } -#leftNav UL { margin: 0px 0px 1.5em 0px; padding: 0px; list-style-type: none; background-color: #EEEEEE; border-top: #3F3849 0px solid; border-right: #3F3849 1px solid; border-left: #3F3849 1px solid; } +#leftNav UL { margin: 0px 0px 1em 0px; padding: 0px; list-style-type: none; background-color: #EEEEEE; border-top: #3F3849 0px solid; border-right: #3F3849 1px solid; border-left: #3F3849 1px solid; } #leftNav UL LI { font-size: 12px; font-weight: bold; border-bottom: 1px solid #3f3849; } #leftNav UL LI A { display: block; padding: 2px 4px; color: #3F3849; text-decoration: none; } #leftNav UL LI A:hover { color: black; background-color: #FFCC33; } Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1] Sat May 2 01:40:11 2009 @@ -2109,8 +2109,8 @@ // prepare some commands var cmdhtml_space = ' '; - var cmdhtml_diff = '<div class="button" onclick="compareEntries()"><img src="'+roscms_intern_webserver_roscms+'images/compare.gif" alt="" /><span class="text">Compare</span></div>'; - var cmdhtml_preview = '<div class="button" onclick="previewPage()"><img src="'+roscms_intern_webserver_roscms+'images/preview.gif" alt="" /><span class="text">Preview</span></div>'; + var cmdhtml_diff = '<div class="button" onclick="compareEntries()"><img src="'+roscms_intern_webserver_roscms+'images/tool.gif" alt="" /><span class="text">Compare</span></div>'; + var cmdhtml_preview = '<div class="button" onclick="previewPage()"><img src="'+roscms_intern_webserver_roscms+'images/search.gif" alt="" /><span class="text">Preview</span></div>'; var cmdhtml_ready = '<div class="button" onclick="changeSelectedTags(\'mn\')"><img src="'+roscms_intern_webserver_roscms+'images/edit.gif" alt="" /><span class="text">Suggest</span></div>'; Modified: branches/danny-web/www/www.reactos.org/roscms/lib/HTML_User.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/HTML_User.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/HTML_User.class.php [iso-8859-1] Sat May 2 01:40:11 2009 @@ -89,7 +89,7 @@ echo_strip(' <h2>Account</h2> <ul> - <li title="'.$thisuser->name().'"> Nick: '.substr($thisuser->name(), 0, 9).'</li> + <li title="'.htmlentities($thisuser->name()).'"> Nick: '.htmlentities($thisuser->name()).'</li> <li><a href="'.$config->pathInstance().'?page=my">My Profile</a></li> <li><a href="'.$config->pathInstance().'?page=search">User Search</a></li> <li><a href="'.$config->pathGenerated().'peoplemap/">User Map</a></li>');

15 years, 4 months

[tkreuzer] 40765: fix compilation of raddr2line, by moving it into the rsym folder, too. Thanks BugBoy for noticing.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 2 01:39:47 2009 New Revision: 40765 URL: http://svn.reactos.org/svn/reactos?rev=40765&view=rev Log: fix compilation of raddr2line, by moving it into the rsym folder, too. Thanks BugBoy for noticing. Added: trunk/reactos/tools/rsym/raddr2line.c - copied unchanged from r40759, trunk/reactos/tools/raddr2line.c trunk/reactos/tools/rsym/raddr2line.mak - copied, changed from r40669, trunk/reactos/tools/raddr2line.mak Removed: trunk/reactos/tools/raddr2line.c trunk/reactos/tools/raddr2line.mak Modified: trunk/reactos/tools/tools.mak Removed: trunk/reactos/tools/raddr2line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/raddr2line.c?rev=407… ============================================================================== --- trunk/reactos/tools/raddr2line.c [iso-8859-1] (original) +++ trunk/reactos/tools/raddr2line.c (removed) @@ -1,188 +1,0 @@ -/* - * Usage: raddr2line input-file address/offset - * - * This is a tool and is compiled using the host compiler, - * i.e. on Linux gcc and not mingw-gcc (cross-compiler). - * Therefore we can't include SDK headers and we have to - * duplicate some definitions here. - * Also note that the internal functions are "old C-style", - * returning an int, where a return of 0 means success and - * non-zero is failure. - */ - -#include <stdio.h> -#include <string.h> -#include <stdlib.h> - -#include "rsym.h" - -size_t fixup_offset ( size_t ImageBase, size_t offset ) -{ -// if ( offset >= ImageBase ) -// offset -= ImageBase; - return offset; -} - -long -my_atoi ( const char* a ) -{ - int i = 0; - const char* fmt = "%x"; - - if ( *a == '0' ) - { - switch ( *++a ) - { - case 'x': - fmt = "%x"; - ++a; - break; - case 'd': - fmt = "%d"; - ++a; - break; - default: - fmt = "%o"; - break; - } - } - sscanf ( a, fmt, &i ); - return i; -} - -PIMAGE_SECTION_HEADER -find_rossym_section ( PIMAGE_FILE_HEADER PEFileHeader, - PIMAGE_SECTION_HEADER PESectionHeaders ) -{ - size_t i; - for ( i = 0; i < PEFileHeader->NumberOfSections; i++ ) - { - if ( 0 == strcmp ( (char*)PESectionHeaders[i].Name, ".rossym" ) ) - return &PESectionHeaders[i]; - } - return NULL; -} - -int -find_and_print_offset ( - void* data, - size_t offset ) -{ - PSYMBOLFILE_HEADER RosSymHeader = (PSYMBOLFILE_HEADER)data; - PROSSYM_ENTRY Entries = (PROSSYM_ENTRY)((char*)data + RosSymHeader->SymbolsOffset); - char* Strings = (char*)data + RosSymHeader->StringsOffset; - size_t symbols = RosSymHeader->SymbolsLength / sizeof(ROSSYM_ENTRY); - size_t i; - - //if ( RosSymHeader->SymbolsOffset ) - - for ( i = 0; i < symbols; i++ ) - { - if ( Entries[i].Address > offset ) - { - if ( !i-- ) - return 1; - else - { - PROSSYM_ENTRY e = &Entries[i]; - printf ( "%s:%u (%s)\n", - &Strings[e->FileOffset], - (unsigned int)e->SourceLine, - &Strings[e->FunctionOffset] ); - return 0; - } - } - } - return 1; -} - -int -process_data ( const void* FileData, size_t FileSize, size_t offset ) -{ - PIMAGE_DOS_HEADER PEDosHeader; - PIMAGE_FILE_HEADER PEFileHeader; - PIMAGE_OPTIONAL_HEADER PEOptHeader; - PIMAGE_SECTION_HEADER PESectionHeaders; - PIMAGE_SECTION_HEADER PERosSymSectionHeader; - size_t ImageBase; - int res; - - /* Check if MZ header exists */ - PEDosHeader = (PIMAGE_DOS_HEADER)FileData; - if (PEDosHeader->e_magic != IMAGE_DOS_MAGIC || PEDosHeader->e_lfanew == 0L) - { - perror("Input file is not a PE image.\n"); - return 1; - } - - /* Locate PE file header */ - /* sizeof(ULONG) = sizeof(MAGIC) */ - PEFileHeader = (PIMAGE_FILE_HEADER)((char *)FileData + PEDosHeader->e_lfanew + sizeof(ULONG)); - - /* Locate optional header */ - PEOptHeader = (PIMAGE_OPTIONAL_HEADER)(PEFileHeader + 1); - ImageBase = PEOptHeader->ImageBase; - - /* Locate PE section headers */ - PESectionHeaders = (PIMAGE_SECTION_HEADER)((char *) PEOptHeader + PEFileHeader->SizeOfOptionalHeader); - - /* make sure offset is what we want */ - offset = fixup_offset ( ImageBase, offset ); - - /* find rossym section */ - PERosSymSectionHeader = find_rossym_section ( - PEFileHeader, PESectionHeaders ); - if ( !PERosSymSectionHeader ) - { - fprintf ( stderr, "Couldn't find rossym section in executable\n" ); - return 1; - } - res = find_and_print_offset ( (char*)FileData + PERosSymSectionHeader->PointerToRawData, - offset ); - if ( res ) - printf ( "??:0\n" ); - return res; -} - -int -process_file ( const char* file_name, size_t offset ) -{ - void* FileData; - size_t FileSize; - int res = 1; - - FileData = load_file ( file_name, &FileSize ); - if ( !FileData ) - { - fprintf ( stderr, "An error occured loading '%s'\n", file_name ); - } - else - { - res = process_data ( FileData, FileSize, offset ); - free ( FileData ); - } - - return res; -} - -int main ( int argc, const char** argv ) -{ - char* path; - size_t offset; - int res; - - if ( argc != 3 ) - { - fprintf(stderr, "Usage: raddr2line <exefile> <offset>\n"); - exit(1); - } - - path = convert_path ( argv[1] ); - offset = my_atoi ( argv[2] ); - - res = process_file ( path, offset ); - - free ( path ); - - return res; -} Removed: trunk/reactos/tools/raddr2line.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/raddr2line.mak?rev=4… ============================================================================== --- trunk/reactos/tools/raddr2line.mak [iso-8859-1] (original) +++ trunk/reactos/tools/raddr2line.mak (removed) @@ -1,41 +1,0 @@ -RADDR2LINE_BASE = $(TOOLS_BASE) -RADDR2LINE_BASE_ = $(RADDR2LINE_BASE)$(SEP) - -RADDR2LINE_INT = $(INTERMEDIATE_)$(RADDR2LINE_BASE) -RADDR2LINE_INT_ = $(RADDR2LINE_INT)$(SEP) -RADDR2LINE_OUT = $(OUTPUT_)$(RADDR2LINE_BASE) -RADDR2LINE_OUT_ = $(RADDR2LINE_OUT)$(SEP) - -RADDR2LINE_TARGET = \ - $(RADDR2LINE_OUT_)raddr2line$(EXEPOSTFIX) - -RADDR2LINE_SOURCES = \ - $(RADDR2LINE_BASE_)raddr2line.c \ - $(RADDR2LINE_BASE_)rsym_common.c - -RADDR2LINE_OBJECTS = \ - $(addprefix $(INTERMEDIATE_), $(RADDR2LINE_SOURCES:.c=.o)) - -RADDR2LINE_HOST_CFLAGS = $(TOOLS_CFLAGS) - -RADDR2LINE_HOST_LFLAGS = $(TOOLS_LFLAGS) - -.PHONY: raddr2line -raddr2line: $(RADDR2LINE_TARGET) - -$(RADDR2LINE_TARGET): $(RADDR2LINE_OBJECTS) | $(RADDR2LINE_OUT) - $(ECHO_HOSTLD) - ${host_gcc} $(RADDR2LINE_OBJECTS) $(RADDR2LINE_HOST_LFLAGS) -o $@ - -$(RADDR2LINE_INT_)raddr2line.o: $(RADDR2LINE_BASE_)raddr2line.c | $(RADDR2LINE_INT) - $(ECHO_HOSTCC) - ${host_gcc} $(RADDR2LINE_HOST_CFLAGS) -c $< -o $@ - -#$(RADDR2LINE_INT_)rsym_common.o: $(RADDR2LINE_BASE_)rsym_common.c | $(RADDR2LINE_INT) -# $(ECHO_HOSTCC) -# ${host_gcc} $(RADDR2LINE_HOST_CFLAGS) -c $< -o $@ - -.PHONY: raddr2line_clean -raddr2line_clean: - -@$(rm) $(RADDR2LINE_TARGET) $(RADDR2LINE_OBJECTS) 2>$(NUL) -clean: raddr2line_clean Copied: trunk/reactos/tools/rsym/raddr2line.mak (from r40669, trunk/reactos/tools/raddr2line.mak) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/raddr2line.mak?… ============================================================================== --- trunk/reactos/tools/raddr2line.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/raddr2line.mak [iso-8859-1] Sat May 2 01:39:47 2009 @@ -1,4 +1,4 @@ -RADDR2LINE_BASE = $(TOOLS_BASE) +RADDR2LINE_BASE = $(TOOLS_BASE)$(SEP)rsym RADDR2LINE_BASE_ = $(RADDR2LINE_BASE)$(SEP) RADDR2LINE_INT = $(INTERMEDIATE_)$(RADDR2LINE_BASE) Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=40765&… ============================================================================== --- trunk/reactos/tools/tools.mak [iso-8859-1] (original) +++ trunk/reactos/tools/tools.mak [iso-8859-1] Sat May 2 01:39:47 2009 @@ -49,6 +49,6 @@ include tools/ofw_interface/ofw_interface.mak endif include tools/pefixup.mak -include tools/raddr2line.mak +include tools/rsym/raddr2line.mak include tools/rbuild/rbuild.mak include tools/rsym/rsym.mak

15 years, 4 months

[cgutman] 40764: - Check for invalid ConfigurationContext - Patch by Daniel Zimmermann with a slight modification by me

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri May 1 23:36:55 2009 New Revision: 40764 URL: http://svn.reactos.org/svn/reactos?rev=40764&view=rev Log: - Check for invalid ConfigurationContext - Patch by Daniel Zimmermann with a slight modification by me Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Fri May 1 23:36:55 2009 @@ -337,6 +337,12 @@ NDIS_DbgPrint(MAX_TRACE,("requested read of %wZ\n", Keyword)); + if (ConfigurationContext == NULL) + { + NDIS_DbgPrint(MID_TRACE,("invalid parameter ConfigurationContext (0x%x)\n",ConfigurationContext)); + return; + } + if( !wcsncmp(Keyword->Buffer, L"Environment", Keyword->Length/sizeof(WCHAR)) && wcslen(L"Environment") == Keyword->Length/sizeof(WCHAR) @@ -907,4 +913,3 @@ *Status = NDIS_STATUS_SUCCESS; } -

15 years, 4 months

[pschweitzer] 40762: Useless stuff has been committed in r40761 ==> partial revert.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri May 1 17:30:23 2009 New Revision: 40762 URL: http://svn.reactos.org/svn/reactos?rev=40762&view=rev Log: Useless stuff has been committed in r40761 ==> partial revert. Modified: branches/pierre-fsd/ntoskrnl/include/internal/io.h Modified: branches/pierre-fsd/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/include/int… ============================================================================== --- branches/pierre-fsd/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/include/internal/io.h [iso-8859-1] Fri May 1 17:30:23 2009 @@ -460,12 +460,6 @@ PVOID Context; } DEVICETREE_TRAVERSE_CONTEXT, *PDEVICETREE_TRAVERSE_CONTEXT; -typedef struct _INT_FILE_OBJECT_FILTER_CONTEXT -{ - FAST_MUTEX FastMutex; - LIST_ENTRY FilterContexts; -} INT_FILE_OBJECT_FILTER_CONTEXT, * PINT_FILE_OBJECT_FILTER_CONTEXT; - // // PNP Routines // @@ -984,23 +978,6 @@ IN ULONG SystemHandleCount ); -/* FIXME: Should be moved to NDK */ -#if 1 -BOOLEAN -NTAPI -IoChangeFileObjectFilterContext( - IN PFILE_OBJECT FileObject, - IN PINT_FILE_OBJECT_FILTER_CONTEXT FilterContext, - IN ULONG Unknown -); - -PINT_FILE_OBJECT_FILTER_CONTEXT -NTAPI -IoGetFileObjectFilterContext( - IN PFILE_OBJECT FileObject -); -#endif - // // I/O Timer Routines //

15 years, 4 months

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 2009