Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[hbirr] 17621: Set the ownership before locking the bitmap in EngCreateDeviceSurface, because GDIOBJ_SetOwnership runs in a dead lock if the object is already locked by the same process.
by hbirr＠svn.reactos.com 03 Sep '05

03 Sep '05

Set the ownership before locking the bitmap in EngCreateDeviceSurface, because GDIOBJ_SetOwnership runs in a dead lock if the object is already locked by the same process. This may fix bug 747. Modified: trunk/reactos/subsys/win32k/eng/surface.c _____ Modified: trunk/reactos/subsys/win32k/eng/surface.c --- trunk/reactos/subsys/win32k/eng/surface.c 2005-09-03 11:51:22 UTC (rev 17620) +++ trunk/reactos/subsys/win32k/eng/surface.c 2005-09-03 17:40:33 UTC (rev 17621) @@ -394,6 +394,8 @@ if (NewSurface == NULL) return 0; + GDIOBJ_SetOwnership(NewSurface, NULL); + BitmapObj = BITMAPOBJ_LockBitmap(NewSurface); if (! BITMAPOBJ_InitBitsLock(BitmapObj)) { @@ -403,8 +405,6 @@ } SurfObj = &BitmapObj->SurfObj; - GDIOBJ_SetOwnership(NewSurface, NULL); - SurfObj->dhsurf = dhsurf; SurfObj->hsurf = NewSurface; SurfObj->sizlBitmap = Size;

1 0

[turner] 17620: Setting my changes back for prompt.c. Greatlord and I agreed about this. These was a miscommication about these changes and the way different MS version handle it.
by turner＠svn.reactos.com 03 Sep '05

03 Sep '05

Setting my changes back for prompt.c. Greatlord and I agreed about this. These was a miscommication about these changes and the way different MS version handle it. Modified: trunk/reactos/subsys/system/cmd/prompt.c _____ Modified: trunk/reactos/subsys/system/cmd/prompt.c --- trunk/reactos/subsys/system/cmd/prompt.c 2005-09-03 11:50:23 UTC (rev 17619) +++ trunk/reactos/subsys/system/cmd/prompt.c 2005-09-03 11:51:22 UTC (rev 17620) @@ -204,12 +204,20 @@ return 0; } + /* if it is null, then it needs to set to default, + because that means the user entered "prompt" only. + so even if param is null you _must_ still set prompt + to the default. There seems to be some kinda difference + between winxp and 2k in this matter and this way will + cover both. */ + if (param[0] != _T('\0')) + _tcscpy(szParam,param); + else + _tcscpy(szParam,_T("$P$G")); + /* set PROMPT environment variable */ - if (param[0] != _T('\0')) - { - if (!SetEnvironmentVariable (_T("PROMPT"), param)) - return 1; - } + if (!SetEnvironmentVariable (_T("PROMPT"), szParam)) + return 1; return 0; }

1 0

[greatlrd] 17619: Updated translation by Anders, proofread by Andreas Bjerkeholt, rename Sw to sv, Sw stand for another language's. Steven can you send this change to winehq.
by greatlrd＠svn.reactos.com 03 Sep '05

03 Sep '05

Updated translation by Anders, proofread by Andreas Bjerkeholt, rename Sw to sv, Sw stand for another language's. Steven can you send this change to winehq. Added: trunk/reactos/subsys/system/notepad/Sv.rc Deleted: trunk/reactos/subsys/system/notepad/Sw.rc Modified: trunk/reactos/subsys/system/notepad/rsrc.rc _____ Added: trunk/reactos/subsys/system/notepad/Sv.rc --- trunk/reactos/subsys/system/notepad/Sv.rc 2005-09-03 11:23:24 UTC (rev 17618) +++ trunk/reactos/subsys/system/notepad/Sv.rc 2005-09-03 11:50:23 UTC (rev 17619) @@ -0,0 +1,127 @@ +/* + * Notepad (Swedish resources) + * + * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> + * Proofread 1998 by David Lee Lambert <lamber45(a)egr.msu.edu> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Fixed by Anders Bergh <anders(a)anders1.org> 2005 + * + * 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 + +MAIN_MENU MENU +{ + POPUP "&Arkiv" { + MENUITEM "&Ny...", CMD_NEW + MENUITEM "&Íppna", CMD_OPEN + MENUITEM "&Spara", CMD_SAVE + MENUITEM "Spara so&m...", CMD_SAVE_AS + MENUITEM "Skriv &ut...", CMD_PRINT + MENUITEM "Utskrifts&format...", CMD_PAGE_SETUP + MENUITEM "Skrivar&instõllningar...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Avsluta", CMD_EXIT + } +POPUP "&Redigera" { + MENUITEM "&?ngra\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Klipp ut\tCtrl+X", CMD_CUT + MENUITEM "K&opiera\tCtrl+C", CMD_COPY + MENUITEM "K&listra in\tCtrl+V", CMD_PASTE + MENUITEM "&Ta bort\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Markera &allt", CMD_SELECT_ALL + MENUITEM "&Tid/datum\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "&Automatiskt radbyte", CMD_WRAP + } +POPUP "&S÷k" { + MENUITEM "S÷k...", CMD_SEARCH + MENUITEM "&S÷k nõsta\tF3", CMD_SEARCH_NEXT + } +POPUP "&Hjõlp" { + MENUITEM "&InnehÕll", CMD_HELP_CONTENTS + MENUITEM "&S÷k...", CMD_HELP_SEARCH + MENUITEM "Anvisningar f÷r hjõlpen", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + POPUP "Inf&ormation..." { + MENUITEM "&Licens", CMD_LICENSE + MENUITEM "&INGEN GARANTI", CMD_NO_WARRANTY + MENUITEM "&Om Wine", CMD_ABOUT_WINE + } + } +} + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Skrivarinstõllningar" +{ +LTEXT "&Huvudnot:", 0x140, 10, 07, 40, 15 +EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +LTEXT "&Fotnot:", 0x142, 10, 24, 40, 15 +EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "Marginaler:", 0x144, 10, 43,160, 45 +LTEXT "&Võnsterkant:", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Íverkant:", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&H÷gerkant:", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Nederkant:", 0x14E,100, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Avbryt", 0x152, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Hjõlp", 0x153, 180, 39, 40, 15, WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ +STRING_PAGESETUP_HEADERVALUE, "&n" +STRING_PAGESETUP_FOOTERVALUE, "Sida &s" +STRING_PAGESETUP_LEFTVALUE, "20 mm" +STRING_PAGESETUP_RIGHTVALUE, "20 mm" +STRING_PAGESETUP_TOPVALUE, "25 mm" +STRING_PAGESETUP_BOTTOMVALUE, "25 mm" + +STRING_NOTEPAD, "Anteckningar" +STRING_ERROR, "FEL" +STRING_WARNING, "VARNING" +STRING_INFO, "Information" + +STRING_UNTITLED, "(namnl÷s)" + +STRING_ALL_FILES, "Alla filer (*.*)" +STRING_TEXT_FILES_TXT, "Textfiler (*.txt)" + +STRING_TOOLARGE, "Filen '%s' õr f÷r stor f÷r Anteckningar.\n \ +Anvõnd en annan editor." +STRING_NOTEXT, "Du skrev inte in nÕgon text. \ +\nSkriv nÕgot och f÷rs÷k sedan igen." +STRING_DOESNOTEXIST, "Filen '%s'\nexisterar inte.\n\n \ +Vill du skapa en ny fil?" +STRING_NOTSAVED, "Filen '%s'\nhar õndrats.\n\n \ +Vill du spara õndringarna?" +STRING_NOTFOUND, "'%s' hittades inte." +STRING_OUT_OF_MEMORY, "Det finns inte tillrõckligt med minne f÷r att kunna slutf÷ra \ +den hõr Õtgõrden. \nAvsluta ett eller flera program f÷r att frig÷ra mer minne." + +} _____ Deleted: trunk/reactos/subsys/system/notepad/Sw.rc --- trunk/reactos/subsys/system/notepad/Sw.rc 2005-09-03 11:23:24 UTC (rev 17618) +++ trunk/reactos/subsys/system/notepad/Sw.rc 2005-09-03 11:50:23 UTC (rev 17619) @@ -1,127 +0,0 @@ -/* - * Notepad (Swedish resources) - * - * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> - * Proofread 1998 by David Lee Lambert <lamber45(a)egr.msu.edu> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * - * 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 - -MAIN_MENU MENU -{ - POPUP "&Arkiv" { - MENUITEM "&Ny...", CMD_NEW - MENUITEM "Í&ppna", CMD_OPEN - MENUITEM "&Spara", CMD_SAVE - MENUITEM "Spara &som...", CMD_SAVE_AS - MENUITEM "&Skriv ut", CMD_PRINT - MENUITEM "Sid La&yout...", CMD_PAGE_SETUP - MENUITEM "Skrivar &instõllningar...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Avsluta", CMD_EXIT - } -POPUP "&Redigera" { - MENUITEM "&Undo\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Klippa\tCtrl+X", CMD_CUT - MENUITEM "&Kopiera\tCtrl+C", CMD_COPY - MENUITEM "&Klistra in\tCtrl+V", CMD_PASTE - MENUITEM "&Ta bort\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Markera &allt", CMD_SELECT_ALL - MENUITEM "&Tid/Datum\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "&Dela lÕnga meningar", CMD_WRAP - } -POPUP "&S÷k" { - MENUITEM "S÷k...", CMD_SEARCH - MENUITEM "&S÷k nõsta\tF3", CMD_SEARCH_NEXT - } -POPUP "&Hjõlp" { - MENUITEM "&InnehÕll", CMD_HELP_CONTENTS - MENUITEM "&S÷k...", CMD_HELP_SEARCH - MENUITEM "Anvõndningen &av hjõlp", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - POPUP "Inf&ormation..." { - MENUITEM "&Licens", CMD_LICENSE - MENUITEM "&INGEN GARANTI", CMD_NO_WARRANTY - MENUITEM "&Om Wine", CMD_ABOUT_WINE - } - } -} - -/* Dialog `Page setup' */ - -DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" -CAPTION "Sid Layout" -{ -LTEXT "&Huvudnot:", 0x140, 10, 07, 40, 15 -EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "&Fotnot:", 0x142, 10, 24, 40, 15 -EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP - -GROUPBOX "Kanter:", 0x144, 10, 43,160, 45 -LTEXT "&Võnster:", 0x145, 20, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Íver:", 0x148, 20, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&H÷ger:", 0x14B, 100, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Under:", 0x14E,100, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP - -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Avbryt", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Hjõlp", 0x153, 180, 39, 40, 15, WS_TABSTOP -} - -STRINGTABLE DISCARDABLE -{ -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Page &s" /* FIXME */ -STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ -STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ - -STRING_NOTEPAD, "Anteckningar" -STRING_ERROR, "FEL" -STRING_WARNING, "WARNING" -STRING_INFO, "Information" - -STRING_UNTITLED, "(untitled)" - -STRING_ALL_FILES, "Alla filer (*.*)" -STRING_TEXT_FILES_TXT, "Text filer (*.txt)" - -STRING_TOOLARGE, "Filen '%s' õr f÷r stor f÷r notepad.\n \ -Anvõnd en annan editor." -STRING_NOTEXT, "Du skrev inte in nÕgon text. \ -\nSkriv nÕgot och f÷rs÷k sedan igen" -STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ -Do you want to create a new file ?" -STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ -Would you like to save the changes ?" -STRING_NOTFOUND, "'%s' hittades inte." -STRING_OUT_OF_MEMORY, "Inte tillrõkligt med minne f÷r att slutf÷ra \ -den hõr uppgiften. \nAvsluta ett eller flera program f÷r att ÷ka mõngden \nfritt \ -minne." - -} _____ Modified: trunk/reactos/subsys/system/notepad/rsrc.rc --- trunk/reactos/subsys/system/notepad/rsrc.rc 2005-09-03 11:23:24 UTC (rev 17618) +++ trunk/reactos/subsys/system/notepad/rsrc.rc 2005-09-03 11:50:23 UTC (rev 17619) @@ -55,7 +55,7 @@ #include "Ru.rc" #include "Si.rc" #include "Sk.rc" -#include "Sw.rc" +#include "Sv.rc" #include "Th.rc" #include "Wa.rc" #include "Zh.rc"

1 0

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

03 Sep '05

Swedish translation by David Nordenberg, proofread by Andreas Bjerkeholt Added: trunk/reactos/subsys/system/userinit/Sv.rc Modified: trunk/reactos/subsys/system/userinit/userinit.rc _____ Added: trunk/reactos/subsys/system/userinit/Sv.rc --- trunk/reactos/subsys/system/userinit/Sv.rc 2005-09-03 11:22:13 UTC (rev 17617) +++ trunk/reactos/subsys/system/userinit/Sv.rc 2005-09-03 11:23:24 UTC (rev 17618) @@ -0,0 +1,12 @@ +#include "resource.h" +/* + * Copyright 2005 David Nordenberg + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +STRING_USERINIT_FAIL, "Userinit misslyckades att starta anvõndargrõnssnittet!\n" + +} _____ Modified: trunk/reactos/subsys/system/userinit/userinit.rc --- trunk/reactos/subsys/system/userinit/userinit.rc 2005-09-03 11:22:13 UTC (rev 17617) +++ trunk/reactos/subsys/system/userinit/userinit.rc 2005-09-03 11:23:24 UTC (rev 17618) @@ -5,5 +5,6 @@ #define REACTOS_STR_INTERNAL_NAME "userinit\0" #define REACTOS_STR_ORIGINAL_FILENAME "userinit.dll\0" #include <reactos/version.rc> + #include "En.rc" - +#include "Sv.rc"

1 0

[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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2005