Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 17617: Swedish translation by Andreas Bjerkeholt, proofread by David Nordenberg. Some did forget add Es.rc to rsrc.rc (the Spanish translations)
by greatlrd＠svn.reactos.com 03 Sep '05

03 Sep '05

Swedish translation by Andreas Bjerkeholt, proofread by David Nordenberg. Some did forget add Es.rc to rsrc.rc (the Spanish translations) Added: trunk/reactos/subsys/system/regedit/Sv.rc Modified: trunk/reactos/subsys/system/regedit/rsrc.rc _____ Added: trunk/reactos/subsys/system/regedit/Sv.rc --- trunk/reactos/subsys/system/regedit/Sv.rc 2005-09-03 11:20:04 UTC (rev 17616) +++ trunk/reactos/subsys/system/regedit/Sv.rc 2005-09-03 11:22:13 UTC (rev 17617) @@ -0,0 +1,364 @@ +/* + * Regedit (Swedish resources) + * + * Copyright 2005 Andreas Bjerkeholt + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +/* + * Menu + */ + +IDC_REGEDIT MENU DISCARDABLE +BEGIN + POPUP "&Arkiv" + BEGIN + MENUITEM "&Avsluta", ID_REGISTRY_EXIT + END + POPUP "&Hjõlp" + BEGIN + MENUITEM "&Om ...", ID_HELP_ABOUT + END +END + +IDR_REGEDIT_MENU MENU DISCARDABLE +BEGIN + POPUP "R&egistret" + BEGIN + MENUITEM "&Importera registerfil...", ID_REGISTRY_IMPORTREGISTRYFILE + + MENUITEM "&Exportera registerfil...", ID_REGISTRY_EXPORTREGISTRYFILE + + MENUITEM SEPARATOR + MENUITEM "&Anslut Nõtverksregister...", + ID_REGISTRY_CONNECTNETWORKREGISTRY + , GRAYED + MENUITEM "&Koppla ifrÕn Nõtverksregister...", + ID_REGISTRY_DISCONNECTNETWORKREGISTRY + , GRAYED + MENUITEM SEPARATOR + MENUITEM "Skriv &ut\tCtrl+P", ID_REGISTRY_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Avsluta", ID_REGISTRY_EXIT + END + POPUP "&Redigera" + BEGIN + MENUITEM "&?ndra", ID_EDIT_MODIFY + MENUITEM SEPARATOR + POPUP "&Ny(tt)" + BEGIN + MENUITEM "&Nyckel", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&Strõngvõrde", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Binõrvõrde", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD-võrde", ID_EDIT_NEW_DWORDVALUE + END + MENUITEM SEPARATOR + MENUITEM "B&eh÷righeter...", ID_EDIT_PERMISSIONS + MENUITEM SEPARATOR + MENUITEM "&Ta bort\tDel", ID_EDIT_DELETE + MENUITEM "&Byt namn", ID_EDIT_RENAME + MENUITEM SEPARATOR + MENUITEM "&Kopiera nyckelnamn", ID_EDIT_COPYKEYNAME + MENUITEM SEPARATOR + MENUITEM "&S÷k\tCtrl+F", ID_EDIT_FIND, GRAYED + MENUITEM "S÷k N&õsta\tF3", ID_EDIT_FINDNEXT, GRAYED + END + POPUP "&Visa" + BEGIN + MENUITEM "Statusfõlt", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "Dela", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&Uppdatera\tF5", ID_VIEW_REFRESH + END + POPUP "&Favoriter" + BEGIN + MENUITEM "&Lõgg till i Favoriter", ID_FAVOURITES_ADDTOFAVOURITES + , GRAYED + MENUITEM "&Ta bort frÕn Favoriter", ID_FAVOURITES_REMOVEFAVOURITE + , GRAYED + END + POPUP "&Hjõlp" + BEGIN + MENUITEM "&Hjõlpavsnitt\tF1", ID_HELP_HELPTOPICS + MENUITEM SEPARATOR + MENUITEM "&Om Registereditorn", ID_HELP_ABOUT + END +END + +IDR_POPUP_MENUS MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&?ndra", ID_EDIT_MODIFY + MENUITEM "?ndra binõrdata", ID_EDIT_MODIFY_BIN + MENUITEM SEPARATOR + MENUITEM "&Ta bort\tDel", ID_EDIT_DELETE + MENUITEM "&Byt namn", ID_EDIT_RENAME + END + POPUP "" + BEGIN + POPUP "&Ny(tt)" + BEGIN + MENUITEM "&Nyckel", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&Strõngvõrde", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Binõrvõrde", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD-võrde", ID_EDIT_NEW_DWORDVALUE + END + END +END + + +/* + * Dialog + */ + +IDD_EDIT_STRING DIALOG 32, 24, 252, 84 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "?ndra strõng" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Võrde:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Data:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,12,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,142,64,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,196,64,50,14 +END + +IDD_EDIT_MULTI_STRING DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "?ndra multi-strõng" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Võrde:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Data:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,102,ES_AUTOHSCROLL | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,142,154,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,196,154,50,14 +END + +IDD_EDIT_BIN_DATA DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "?ndra Binõrvõrde" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Võrde:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Data:",IDC_STATIC,6,35,161,8 + CONTROL "",IDC_VALUE_DATA,"HexEdit32",WS_VSCROLL | WS_BORDER | WS_TABSTOP,6,46,240,102 + DEFPUSHBUTTON "OK",IDOK,142,154,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,196,154,50,14 +END + + +IDD_EDIT_DWORD DIALOG 32, 24, 252, 104 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "?ndra DWORD-võrde" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Võrde:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Data:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,116,12,ES_AUTOHSCROLL + GROUPBOX "Bas",IDC_STATIC,130,35,116,39 + AUTORADIOBUTTON "&Hexadecimal",IDC_FORMAT_HEX,141,46,60,10,WS_GROUP + AUTORADIOBUTTON "&Decimal",IDC_FORMAT_DEC,141,59,60,10 + DEFPUSHBUTTON "OK",IDOK,142,82,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,196,82,50,14 +END + +/* + * String Table + */ + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LIST_COLUMN_NAME "Namn" + IDS_LIST_COLUMN_TYPE "Typ" + IDS_LIST_COLUMN_DATA "Data" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Registereditorn" + IDC_REGEDIT "REGEDIT" + IDC_REGEDIT_FRAME "REGEDIT_FRAME" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_REGISTRY_MENU "InnehÕller kommandon f÷r att arbeta med hela registret" + ID_EDIT_MENU "InnehÕller kommandon f÷r att õndra võrden och nycklar" + ID_VIEW_MENU "InnehÕller kommandon f÷r att anpassa registerf÷nstret" + ID_FAVOURITES_MENU "InnehÕller kommandon f÷r att komma Õt nycklar som anvõnds ofta" + ID_HELP_MENU "InnehÕller kommandon f÷r att visa hjõlpen och information om Registereditorn" + ID_EDIT_NEW_MENU "InnehÕller kommandon f÷r att skapa nya nycklar eller võrden" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_EDIT_MODIFY "?ndrar võrdets data" + ID_EDIT_NEW_KEY "Lõgger till en ny nyckel" + ID_EDIT_NEW_STRINGVALUE "Lõgger till ett nytt strõngvõrde" + ID_EDIT_NEW_BINARYVALUE "Lõgger till ett nytt binõrt võrde" + ID_EDIT_NEW_DWORDVALUE "Lõgger till ett nytt dubbelordsvõrde" + ID_REGISTRY_IMPORTREGISTRYFILE "Importerar en textfil till registret" + ID_REGISTRY_EXPORTREGISTRYFILE + "Exporterar hela eller en del av registret till en textfil" + ID_REGISTRY_CONNECTNETWORKREGISTRY + "Ansluter till en annan dators register" + ID_REGISTRY_DISCONNECTNETWORKREGISTRY + "Kopplar ifrÕn en annan dators register" + ID_REGISTRY_PRINT "Skriver ut hela eller en del av registret" +/* ID_HELP_HELPTOPICS "Íppnar hjõlpen f÷r Registereditorn" */ + ID_HELP_ABOUT "Visar programinformation, versionsnummer, och upphovsrõtt" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_REGISTRY_EXIT "Avslutar Registereditorn" + ID_FAVOURITES_ADDTOFAVOURITES "Lõgger till nycklar till Favoriter" + ID_FAVOURITES_REMOVEFAVOURITE "Tar bort nycklar frÕn Favoriter" + ID_VIEW_STATUSBAR "Visar eller d÷ljer statusfõltet" + ID_VIEW_SPLIT "?ndra storlek pÕ delningslisten" + ID_VIEW_REFRESH "Uppdaterar f÷nstret" + ID_EDIT_DELETE "Tar bort markeringen" + ID_EDIT_RENAME "Byter namn pÕ markeringen" + ID_EDIT_COPYKEYNAME "Kopierar namnet pÕ den valda nyckeln till urklippet" + ID_EDIT_FIND "Hittar en textstrõng i en nyckel, ett võrde eller data" + ID_EDIT_FINDNEXT "S÷ker igen efter nõsta trõff i registret" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ERROR "Fel" + IDS_WARNING "Varning" + IDS_BAD_VALUE "Kan inte lõsa võrdet '%s'" + IDS_UNSUPPORTED_TYPE "Kan inte õndra nycklar av typen %ld" + IDS_TOO_BIG_VALUE "Võrdet õr f÷r stort (%ld)" + IDS_MULTI_SZ_EMPTY_STRING "Data av typen REG_MULTI_SZ kan inte innehÕlla tomma strõngar.\nDe tomma strõngarna har tagits bort frÕn listan." + IDS_QUERY_DELETE_ONE "?r du sõker pÕ att du vill ta bort detta võrde?" + IDS_QUERY_DELETE_MORE "?r du sõker pÕ att du vill ta bort dessa võrden?" + IDS_QUERY_DELETE_CONFIRM "Bekrõfta borttagning av võrde" + IDS_ERR_DELVAL_CAPTION "Borttagning misslyckades" + IDS_ERR_DELETEVALUE "Det gick inte att ta bort alla specificerade võrden!" + IDS_ERR_RENVAL_CAPTION "Namnbyte misslyckades" + IDS_ERR_RENVAL_TOEMPTY "Kunde inte byta namn pÕ %s. Det specificerade võrdenamnet õr tomt. Ange ett annat namn och f÷rs÷k igen." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BINARY_EMPTY "(Tomt binõrvõrde)" + IDS_DEFAULT_VALUE_NAME "(Standard)" + IDS_VALUE_NOT_SET "(võrde ej angivet)" + IDS_UNKNOWN_TYPE "Okõnd typ: (0x%lx)" + IDS_MY_COMPUTER "Den hõr datorn" + IDS_IMPORT_REG_FILE "Importera registerfil" + IDS_EXPORT_REG_FILE "Exportera registerfil" + IDS_INVALID_DWORD "(felaktigt DWORD-võrde)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FLT_REGFILES "Registerfiler" + IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_REGEDIT4 "Win9x/NT4-Registerfiler (REGEDIT4)" + IDS_FLT_REGEDIT4_FLT "*.reg" + IDS_FLT_ALLFILES "Alla filer (*.*)" + IDS_FLT_ALLFILES_FLT "*.*" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ACCESS_FULLCONTROL "Fullstõndig beh÷righet" + IDS_ACCESS_READ "Lõsa" + IDS_ACCESS_QUERYVALUE "Lõsa võrde" + IDS_ACCESS_SETVALUE "Ange võrde" + IDS_ACCESS_CREATESUBKEY "Skapa undernyckel" + IDS_ACCESS_ENUMERATESUBKEYS "Rõkna upp undernycklar" + IDS_ACCESS_NOTIFY "Meddela" + IDS_ACCESS_CREATELINK "Skapa lõnk" + IDS_ACCESS_DELETE "Ta bort" + IDS_ACCESS_WRITEDAC "Skriva DAC" + IDS_ACCESS_WRITEOWNER "Skriva õgare" + IDS_ACCESS_READCONTROL "Lõsa beh÷righet" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INHERIT_THISKEYONLY "Endast denna nyckel" + IDS_INHERIT_THISKEYANDSUBKEYS "Denna nyckel samt undernycklar" + IDS_INHERIT_SUBKEYSONLY "Endast undernycklar" +END + +/*****************************************************************/ + + +/* + * Dialog + */ + +IDD_DIALOG1 DIALOG DISCARDABLE 50, 50, 268, 98 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + WS_BORDER +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_DIALOG2 DIALOG DISCARDABLE 0, 0, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dialog" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,130,7,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,130,24,50,14 +END + + +/* + * TEXTINCLUDE + */ + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + + + +/* + * String Table + */ + +/* + *STRINGTABLE DISCARDABLE + *BEGIN + * ID_HELP_HELPTOPICS "Íppnar hjõlpen f÷r Registereditorn." + * ID_HELP_ABOUT "Visar programinformation, versionsnummer, och upphovsrõtt." + *END + */ + +/*****************************************************************/ _____ Modified: trunk/reactos/subsys/system/regedit/rsrc.rc --- trunk/reactos/subsys/system/regedit/rsrc.rc 2005-09-03 11:20:04 UTC (rev 17616) +++ trunk/reactos/subsys/system/regedit/rsrc.rc 2005-09-03 11:22:13 UTC (rev 17617) @@ -30,10 +30,12 @@ #include "Cz.rc" #include "De.rc" #include "En.rc" +#include "Es.rc" #include "Fr.rc" #include "It.rc" #include "Nl.rc" #include "Pt.rc" #include "Ru.rc" #include "Si.rc" +#include "Sv.rc"

1 0

[ros-diffs] [greatlrd] 17616: David Nordenberg: Swedish translation, proofread by Andreas Bjerkeholt
by greatlrd＠svn.reactos.com 03 Sep '05

03 Sep '05

David Nordenberg: Swedish translation, proofread by Andreas Bjerkeholt Added: trunk/reactos/subsys/system/expand/Sv.rc Modified: trunk/reactos/subsys/system/expand/expand.rc _____ Added: trunk/reactos/subsys/system/expand/Sv.rc --- trunk/reactos/subsys/system/expand/Sv.rc 2005-09-03 11:05:31 UTC (rev 17615) +++ trunk/reactos/subsys/system/expand/Sv.rc 2005-09-03 11:20:04 UTC (rev 17616) @@ -0,0 +1,15 @@ +#include "resource.h" +/* + * Copyright 2005 David Nordenberg + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +IDS_Copy, "ReactOS verktyg f÷r filextrahering version 1.0\n\ +Copyright Victor Schneider 1997\n\n\ +Anvõndning: %s kõllfil [mÕlfil]\n" + +IDS_FAILS "LZCopy misslyckades, felkod: %ld\n" +} _____ Modified: trunk/reactos/subsys/system/expand/expand.rc --- trunk/reactos/subsys/system/expand/expand.rc 2005-09-03 11:05:31 UTC (rev 17615) +++ trunk/reactos/subsys/system/expand/expand.rc 2005-09-03 11:20:04 UTC (rev 17616) @@ -7,3 +7,4 @@ #include "En.rc" #include "De.rc" +#include "Sv.rc"

1 0

[greatlrd] 17615: * Updated translation by Anders, proofread by Andreas Bjerkeholt
by greatlrd＠svn.reactos.com 03 Sep '05

03 Sep '05

* Updated translation by Anders, proofread by Andreas Bjerkeholt Modified: trunk/reactos/lib/aclui/aclui_Sv.rc _____ Modified: trunk/reactos/lib/aclui/aclui_Sv.rc --- trunk/reactos/lib/aclui/aclui_Sv.rc 2005-09-03 09:46:46 UTC (rev 17614) +++ trunk/reactos/lib/aclui/aclui_Sv.rc 2005-09-03 11:05:31 UTC (rev 17615) @@ -1,5 +1,6 @@ /* * Copyright 2005 Andreas Bjerkeholt + * Copyright 2005 Anders Bergh * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,16 +32,16 @@ LTEXT "TillÕt", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER LTEXT "Neka", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE - LTEXT "For special permissions or for advanced settings, click Advanced.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT - PUSHBUTTON "Ad&vanced", IDC_ADVANCED, 165, 194, 55, 14 + LTEXT "F÷r sõrskilda beh÷righeter eller f÷r avancerade instõllningar, klicka pÕ Avancerat.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "A&vancerat", IDC_ADVANCED, 165, 194, 55, 14 END STRINGTABLE DISCARDABLE { IDS_PSP_TITLE "Beh÷righeter f÷r %1" - IDS_UNKNOWN "Unknown" - IDS_SPECIAL_PERMISSIONS "Special Permissions" - IDS_PERMISSIONS_FOR "Permissions for %1" - IDS_PERMISSIONS "Permissions" + IDS_UNKNOWN "Okõnd" + IDS_SPECIAL_PERMISSIONS "Sõrskilda beh÷righeter" + IDS_PERMISSIONS_FOR "Beh÷righeter f÷r %1" + IDS_PERMISSIONS "Beh÷righeter" }

1 0

[greatlrd] 17614: revers brandon change to prompt.c they are incorrect. Add a check if prompt env are set or not. if it is not set cmd set the prompt value. in cmd.c brandon forget that.
by greatlrd＠svn.reactos.com 03 Sep '05

03 Sep '05

revers brandon change to prompt.c they are incorrect. Add a check if prompt env are set or not. if it is not set cmd set the prompt value. in cmd.c brandon forget that. Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/prompt.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-03 01:34:40 UTC (rev 17613) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-03 09:46:46 UTC (rev 17614) @@ -1311,6 +1311,7 @@ TCHAR commandline[CMDLINE_LENGTH]; TCHAR ModuleName[_MAX_PATH + 1]; INT i; + TCHAR lpBuffer[2]; //INT len; //TCHAR *ptr, *cmdLine; @@ -1358,7 +1359,12 @@ hOut = GetStdHandle (STD_OUTPUT_HANDLE); hIn = GetStdHandle (STD_INPUT_HANDLE); - SetEnvironmentVariable (_T("PROMPT"), _T("$P$G")); + /* Set EnvironmentVariable PROMPT if it does not exists any env value. + for you can change the EnvirommentVariable for prompt before cmd start + this patch are not 100% right, if it does not exists a PROMPT value cmd should use + $P$G as defualt not set EnvirommentVariable PROMPT to $P$G if it does not exists */ + if (GetEnvironmentVariable(_T("PROMPT"),lpBuffer, 2 * sizeof(TCHAR)) == 0) + SetEnvironmentVariable (_T("PROMPT"), _T("$P$G")); if (argc >= 2 && !_tcsncmp (argv[1], _T("/?"), 2)) _____ Modified: trunk/reactos/subsys/system/cmd/prompt.c --- trunk/reactos/subsys/system/cmd/prompt.c 2005-09-03 01:34:40 UTC (rev 17613) +++ trunk/reactos/subsys/system/cmd/prompt.c 2005-09-03 09:46:46 UTC (rev 17614) @@ -192,8 +192,7 @@ #ifdef INCLUDE_CMD_PROMPT INT cmd_prompt (LPTSTR cmd, LPTSTR param) -{ - TCHAR szParam[512]; +{ if (!_tcsncmp (param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_PROMPT_HELP1); @@ -204,15 +203,14 @@ ConOutResPaging(FALSE,STRING_PROMPT_HELP3); return 0; } - if (param[0] != _T('\0')) - _tcscpy(szParam,param); - else - _tcscpy(szParam,_T("$P$G")); /* set PROMPT environment variable */ - if (!SetEnvironmentVariable (_T("PROMPT"), szParam)) - return 1; - + if (param[0] != _T('\0')) + { + if (!SetEnvironmentVariable (_T("PROMPT"), param)) + return 1; + } + return 0; } #endif

1 0

[turner] 17613: Correctly assign %propmt%.
by turner＠svn.reactos.com 03 Sep '05

03 Sep '05

Correctly assign %propmt%. cmd.c = give %prompt% default value of $P$G prompt.c = when param are null, assign %prompt% to $P$G Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/prompt.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-03 01:19:25 UTC (rev 17612) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-03 01:34:40 UTC (rev 17613) @@ -1358,7 +1358,9 @@ hOut = GetStdHandle (STD_OUTPUT_HANDLE); hIn = GetStdHandle (STD_INPUT_HANDLE); + SetEnvironmentVariable (_T("PROMPT"), _T("$P$G")); + if (argc >= 2 && !_tcsncmp (argv[1], _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_CMD_HELP8); _____ Modified: trunk/reactos/subsys/system/cmd/prompt.c --- trunk/reactos/subsys/system/cmd/prompt.c 2005-09-03 01:19:25 UTC (rev 17612) +++ trunk/reactos/subsys/system/cmd/prompt.c 2005-09-03 01:34:40 UTC (rev 17613) @@ -193,7 +193,7 @@ INT cmd_prompt (LPTSTR cmd, LPTSTR param) { - + TCHAR szParam[512]; if (!_tcsncmp (param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_PROMPT_HELP1); @@ -204,9 +204,13 @@ ConOutResPaging(FALSE,STRING_PROMPT_HELP3); return 0; } + if (param[0] != _T('\0')) + _tcscpy(szParam,param); + else + _tcscpy(szParam,_T("$P$G")); /* set PROMPT environment variable */ - if (!SetEnvironmentVariable (_T("PROMPT"), param)) + if (!SetEnvironmentVariable (_T("PROMPT"), szParam)) return 1; return 0;

1 0

[royce] 17612: small efficiency boost
by royce＠svn.reactos.com 03 Sep '05

03 Sep '05

small efficiency boost Modified: trunk/reactos/tools/rbuild/XML.cpp _____ Modified: trunk/reactos/tools/rbuild/XML.cpp --- trunk/reactos/tools/rbuild/XML.cpp 2005-09-02 22:41:40 UTC (rev 17611) +++ trunk/reactos/tools/rbuild/XML.cpp 2005-09-03 01:19:25 UTC (rev 17612) @@ -228,10 +228,8 @@ prev = p; p = strtok ( NULL, "/\\" ); } - if ( include_last ) + if ( include_last && strcmp ( prev, "." ) ) out.push_back ( prev ); - if ( out.back() == "." ) - out.pop_back(); } XMLFile::XMLFile()

1 0

[turner] 17611: Fixed a bug that crashed cmd when "cd /D" but no path. Bug reported by Harteex.
by turner＠svn.reactos.com 02 Sep '05

02 Sep '05

Fixed a bug that crashed cmd when "cd /D" but no path. Bug reported by Harteex. Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-09-02 21:26:51 UTC (rev 17610) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-09-02 22:41:40 UTC (rev 17611) @@ -296,9 +296,16 @@ { bChangeDrive = TRUE; tmpPath = _tcsstr(param,_T(" ")); + if(!tmpPath) + { + /* Didnt find an directories */ + LoadString(CMD_ModuleHandle, STRING_ERROR_PATH_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg); + nErrorLevel = 1; + return 1; + } tmpPath++; _tcscpy(szPath,tmpPath); - } else {

1 0

[hpoussin] 17610: Remove warnings
by hpoussin＠svn.reactos.com 02 Sep '05

02 Sep '05

Remove warnings Modified: trunk/rosapps/net/netreg/netreg.cpp Modified: trunk/rosapps/net/netreg/netreg.xml _____ Modified: trunk/rosapps/net/netreg/netreg.cpp --- trunk/rosapps/net/netreg/netreg.cpp 2005-09-02 21:13:10 UTC (rev 17609) +++ trunk/rosapps/net/netreg/netreg.cpp 2005-09-02 21:26:51 UTC (rev 17610) @@ -403,8 +403,8 @@ string full_input; string remaining_output; - RHState state; SOCKET socket; + RHState state; }; SOCKET make_listening_socket( int port ) { @@ -440,7 +440,7 @@ SOCKET listen_socket; int i; int port_to_listen = 80; - int active_fds = 0; + unsigned int active_fds = 0; for( i = 1; i < argc; i++ ) { if( string( "-p" ) == argv[i] ) { @@ -480,8 +480,6 @@ FD_SET(listen_socket,&pollin); - struct timeval tv; - active_fds = select( active_fds, &pollin, &pollout, &pollerr, NULL ); if( active_fds > 0 ) { _____ Modified: trunk/rosapps/net/netreg/netreg.xml --- trunk/rosapps/net/netreg/netreg.xml 2005-09-02 21:13:10 UTC (rev 17609) +++ trunk/rosapps/net/netreg/netreg.xml 2005-09-02 21:26:51 UTC (rev 17610) @@ -1,4 +1,4 @@ -<module name="netreg" type="win32cui" installbase="system32" installname="netreg.exe" warnings="true"> +<module name="netreg" type="win32cui" installbase="system32" installname="netreg.exe"> <include base="netreg">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define>

1 0

[hpoussin] 17609: RmRemove warnings
by hpoussin＠svn.reactos.com 02 Sep '05

02 Sep '05

RmRemove warnings Modified: trunk/rosapps/dflat32/dflat32.xml Modified: trunk/rosapps/dflat32/edit.c Modified: trunk/rosapps/dflat32/normal.c Modified: trunk/rosapps/net/niclist/niclist.c Modified: trunk/rosapps/net/niclist/niclist.xml Modified: trunk/rosapps/notevil/notevil.c Modified: trunk/rosapps/notevil/notevil.xml Modified: trunk/rosapps/templates/dialog/page1.c _____ Modified: trunk/rosapps/dflat32/dflat32.xml --- trunk/rosapps/dflat32/dflat32.xml 2005-09-02 21:11:17 UTC (rev 17608) +++ trunk/rosapps/dflat32/dflat32.xml 2005-09-02 21:13:10 UTC (rev 17609) @@ -1,4 +1,4 @@ -<module name="dflat32" type="win32cui" installbase="system32" installname="edit.exe" warnings="true"> +<module name="dflat32" type="win32cui" installbase="system32" installname="edit.exe"> <include base="ReactOS">include/wine</include> <include base="dflat32">.</include> <define name="__USE_W32API" /> _____ Modified: trunk/rosapps/dflat32/edit.c --- trunk/rosapps/dflat32/edit.c 2005-09-02 21:11:17 UTC (rev 17608) +++ trunk/rosapps/dflat32/edit.c 2005-09-02 21:13:10 UTC (rev 17609) @@ -260,7 +260,6 @@ DFWINDOW wwnd; struct stat sb; char *Fname = FileName; - char *Fnewname = NewFileName; char *ermsg; if (strcmp(FileName, Untitled)) _____ Modified: trunk/rosapps/dflat32/normal.c --- trunk/rosapps/dflat32/normal.c 2005-09-02 21:11:17 UTC (rev 17608) +++ trunk/rosapps/dflat32/normal.c 2005-09-02 21:13:10 UTC (rev 17609) @@ -21,7 +21,7 @@ static int px = -1, py = -1; static int diff; static struct DfWindow dwnd = {DF_DUMMY, NULL, DfNormalProc, - {-1,-1,-1,-1}}; + {{-1},{-1},{-1},{-1}}}; static PCHAR_INFO Bsave; static int Bht, Bwd; BOOL DfWindowMoving; _____ Modified: trunk/rosapps/net/niclist/niclist.c --- trunk/rosapps/net/niclist/niclist.c 2005-09-02 21:11:17 UTC (rev 17608) +++ trunk/rosapps/net/niclist/niclist.c 2005-09-02 21:13:10 UTC (rev 17609) @@ -82,7 +82,7 @@ strDesc = (LPSTR)++wstrName; if (!nAdapterCount) { - printf("No Packet Adaptors found (%d)\n", AdapterLength); + printf("No Packet Adaptors found (%lu)\n", AdapterLength); } else { printf("Adaptor count: %d\n", nAdapterCount); } _____ Modified: trunk/rosapps/net/niclist/niclist.xml --- trunk/rosapps/net/niclist/niclist.xml 2005-09-02 21:11:17 UTC (rev 17608) +++ trunk/rosapps/net/niclist/niclist.xml 2005-09-02 21:13:10 UTC (rev 17609) @@ -1,4 +1,4 @@ -<module name="niclist" type="win32cui" installbase="system32" installname="niclist.exe" warnings="true"> +<module name="niclist" type="win32cui" installbase="system32" installname="niclist.exe"> <include base="niclist">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define> _____ Modified: trunk/rosapps/notevil/notevil.c --- trunk/rosapps/notevil/notevil.c 2005-09-02 21:11:17 UTC (rev 17608) +++ trunk/rosapps/notevil/notevil.c 2005-09-02 21:13:10 UTC (rev 17609) @@ -254,7 +254,7 @@ lint.QuadPart = -2000000; if( SetWaitableTimer( WaitableTimer, &lint, 200, NULL, NULL, FALSE ) == FALSE ) { - printf( "SetWaitableTimer() failed: %x\n", GetLastError() ); + printf( "SetWaitableTimer() failed: 0x%lx\n", GetLastError() ); return 2; } SetConsoleActiveScreenBuffer(ScreenBuffer); _____ Modified: trunk/rosapps/notevil/notevil.xml --- trunk/rosapps/notevil/notevil.xml 2005-09-02 21:11:17 UTC (rev 17608) +++ trunk/rosapps/notevil/notevil.xml 2005-09-02 21:13:10 UTC (rev 17609) @@ -1,4 +1,4 @@ -<module name="notevil" type="win32cui" installbase="system32" installname="notevil.exe" warnings="true"> +<module name="notevil" type="win32cui" installbase="system32" installname="notevil.exe"> <include base="notevil">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define> _____ Modified: trunk/rosapps/templates/dialog/page1.c --- trunk/rosapps/templates/dialog/page1.c 2005-09-02 21:11:17 UTC (rev 17608) +++ trunk/rosapps/templates/dialog/page1.c 2005-09-02 21:13:10 UTC (rev 17609) @@ -42,12 +42,6 @@ //////////////////////////////////////////////////////////////////////// //////// -static void AddItem(HWND hListBox, LPCTSTR lpstr, HBITMAP hbmp) -{ - int nItem = SendMessage(hListBox, LB_ADDSTRING, 0, (LPARAM)lpstr); - SendMessage(hListBox, LB_SETITEMDATA, nItem, (LPARAM)hbmp); -} - static TCHAR* items[] = { _T("services"), _T("event log"),

1 0

[hpoussin] 17608: Remove DbgPrint statements as they were not executed + some of them were badly placed
by hpoussin＠svn.reactos.com 02 Sep '05

02 Sep '05

Remove DbgPrint statements as they were not executed + some of them were badly placed Modified: trunk/rosapps/cmdutils/touch/touch.c Modified: trunk/rosapps/cmdutils/touch/touch.xml _____ Modified: trunk/rosapps/cmdutils/touch/touch.c --- trunk/rosapps/cmdutils/touch/touch.c 2005-09-02 20:45:56 UTC (rev 17607) +++ trunk/rosapps/cmdutils/touch/touch.c 2005-09-02 21:11:17 UTC (rev 17608) @@ -42,10 +42,6 @@ All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)touch.c 5.5 (Berkeley) 3/7/93"; -#endif /* not lint */ - #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> @@ -95,35 +91,35 @@ while ((ch = getopt(argc, argv, "acfmr:t:")) != EOF) switch(ch) { case 'a': - aflag = 1; DbgPrint("[%s]", "[1]"); + aflag = 1; break; case 'c': - cflag = 1; DbgPrint("[%s]", "[2]"); + cflag = 1; break; case 'f': - fflag = 1; DbgPrint("[%s]", "[3]"); + fflag = 1; break; case 'm': - mflag = 1; DbgPrint("[%s]", "[4]"); + mflag = 1; break; case 'r': timeset = 1; - stime_file(optarg, tv); DbgPrint("[%s]", "[5]"); + stime_file(optarg, tv); break; case 't': timeset = 1; - stime_arg1(optarg, tv); DbgPrint("[%s]", "[6]"); + stime_arg1(optarg, tv); break; case '?': default: - usage(); DbgPrint("[%s]", "[7]"); + usage(); } argc -= optind; argv += optind; /* Default is both -a and -m. */ if (aflag == 0 && mflag == 0) - aflag = mflag = 1; DbgPrint("[%s]", "[8]"); + aflag = mflag = 1; /* * If no -r or -t flag, at least two operands, the first of which @@ -134,51 +130,52 @@ len = p - argv[0]; if (*p == '\0' && (len == 8 || len == 10)) { timeset = 1; - stime_arg2(argv[0], len == 10, tv); DbgPrint("[%s]", "[9]"); + stime_arg2(argv[0], len == 10, tv); } } /* Otherwise use the current time of day. */ if (!timeset) - tv[1] = tv[0]; DbgPrint("[%s]", "[10]"); + tv[1] = tv[0]; if (*argv == NULL) - usage(); DbgPrint("[%s]", "[11]"); + usage(); for (rval = 0; *argv; ++argv) { /* See if the file exists. */ - if (stat(*argv, &sb)) + if (stat(*argv, &sb)) { if (!cflag) { /* Create the file. */ fd = open(*argv, O_WRONLY | O_CREAT, DEFFILEMODE); if (fd == -1 || fstat(fd, &sb) || close(fd)) { rval = 1; - warn("%s", *argv); DbgPrint("[%s]", "[12]"); - continue; DbgPrint("[%s]", "[13]"); + warn("%s", *argv); + continue; } /* If using the current time, we're done. */ if (!timeset) - continue; DbgPrint("[%s]", "[14]"); + continue; } else - continue; DbgPrint("[%s]", "[15]"); + continue; + } if (!aflag) - tv[0] = sb.st_atime; DbgPrint("[%s]", "[16]"); + tv[0] = sb.st_atime; if (!mflag) - tv[1] = sb.st_mtime; DbgPrint("[%s]", "[17]"); + tv[1] = sb.st_mtime; /* Try utime. */ - utb.actime = tv[0]; DbgPrint("[%s]", "[18]"); - utb.modtime = tv[1]; DbgPrint("[%s]", "[19]"); + utb.actime = tv[0]; + utb.modtime = tv[1]; if (!utime(*argv, &utb)) - continue; DbgPrint("[%s]", "[20]"); + continue; /* If the user specified a time, nothing else we can do. */ if (timeset) { - rval = 1; DbgPrint("[%s]", "[21]"); - warn("%s", *argv); DbgPrint("[%s]", "[22]"); + rval = 1; + warn("%s", *argv); } /* @@ -188,13 +185,13 @@ * ability to write the file is sufficient. Take a shot. */ if (!utime(*argv, NULL)) - continue; DbgPrint("[%s]", "[23]"); + continue; /* Try reading/writing. */ if (rw(*argv, &sb, fflag)) - rval = 1; DbgPrint("[%s]", "[23]"); + rval = 1; } - return rval; DbgPrint("[%s]", "[23]"); + return rval; } #define ATOI2(ar) ((ar)[0] - '0') * 10 + ((ar)[1] - '0'); (ar) += 2; @@ -207,7 +204,7 @@ char *p; /* Start with the current time. */ if ((t = localtime(&tvp[0])) == NULL) - err(1, "localtime"); DbgPrint("[%s]", "[23]"); + err(1, "localtime"); /* [[CC]YY]MMDDhhmm[.SS] */ if ((p = strchr(arg, '.')) == NULL) t->tm_sec = 0; /* Seconds defaults to 0. */ @@ -282,12 +279,12 @@ void stime_file(char *fname, time_t *tvp) { - struct stat sb; DbgPrint("[%s]", "[stime_file1]"); + struct stat sb; if (stat(fname, &sb)) - err(1, "%s", fname); DbgPrint("[%s]", "[stime_file1]"); - tvp[0] = sb.st_atime; DbgPrint("[%s]", "[stime_file1]"); - tvp[1] = sb.st_mtime; DbgPrint("[%s]", "[stime_file1]"); + err(1, "%s", fname); + tvp[0] = sb.st_atime; + tvp[1] = sb.st_mtime; } int @@ -298,7 +295,7 @@ /* Try regular files and directories. */ if (!S_ISREG(sbp->st_mode) && !S_ISDIR(sbp->st_mode)) { - warnx("%s: %s", fname, strerror(0)); DbgPrint("[%s]", "[rw1]"); + warnx("%s: %s", fname, strerror(0)); return (1); } @@ -307,37 +304,37 @@ if (!force || chmod(fname, DEFFILEMODE)) goto err; if ((fd = open(fname, O_RDWR, 0)) == -1) - goto err; DbgPrint("[%s]", "[rw2]"); - needed_chmod = 1; DbgPrint("[%s]", "[rw3]"); + goto err; + needed_chmod = 1; } if (sbp->st_size != 0) { if (read(fd, &byte, sizeof(byte)) != sizeof(byte)) - goto err; DbgPrint("[%s]", "[rw4]"); + goto err; if (lseek(fd, (off_t)0, SEEK_SET) == -1) - goto err; DbgPrint("[%s]", "[rw5]"); + goto err; if (write(fd, &byte, sizeof(byte)) != sizeof(byte)) - goto err; DbgPrint("[%s]", "[rw6]"); + goto err; } else { if (write(fd, &byte, sizeof(byte)) != sizeof(byte)) { -err: rval = 1; DbgPrint("[%s]", "[rw7]"); +err: rval = 1; warn("%s", fname); /* } else if (ftruncate(fd, (off_t)0)) {*/ } else if (chsize(fd, (off_t)0)) { - rval = 1; DbgPrint("[%s]", "[rw8]"); - warn("%s: file modified", fname);DbgPrint("[%s]", "[rw9]"); + rval = 1; + warn("%s: file modified", fname); } } if (close(fd) && rval != 1) { - rval = 1; DbgPrint("[%s]", "[rw10]"); - warn("%s", fname); DbgPrint("[%s]", "[rw11]"); + rval = 1; + warn("%s", fname); } if (needed_chmod && chmod(fname, sbp->st_mode) && rval != 1) { rval = 1; - warn("%s: permissions modified", fname); DbgPrint("[%s]", "[rw12]"); + warn("%s: permissions modified", fname); } - return (rval); DbgPrint("[%s]", "[rw13]"); + return (rval); } /*__dead void*/ _____ Modified: trunk/rosapps/cmdutils/touch/touch.xml --- trunk/rosapps/cmdutils/touch/touch.xml 2005-09-02 20:45:56 UTC (rev 17607) +++ trunk/rosapps/cmdutils/touch/touch.xml 2005-09-02 21:11:17 UTC (rev 17608) @@ -1,4 +1,4 @@ -<module name="touch" type="win32cui" installbase="system32" installname="touch.exe" warnings="true"> +<module name="touch" type="win32cui" installbase="system32" installname="touch.exe"> <include base="touch">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs