Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

by gvg＠svn.reactos.com

Merge from trunk: Don't install Winefile icon on desktop, it's already present in the start menu Modified: branches/ros-branch-0_2_8/reactos/lib/syssetup/install.c _____ Modified: branches/ros-branch-0_2_8/reactos/lib/syssetup/install.c --- branches/ros-branch-0_2_8/reactos/lib/syssetup/install.c 2005-10-14 09:33:31 UTC (rev 18437) +++ branches/ros-branch-0_2_8/reactos/lib/syssetup/install.c 2005-10-14 09:34:15 UTC (rev 18438) @@ -399,7 +399,6 @@ /* desktop shortcuts */ CreateShortcut(CSIDL_DESKTOP, _T("Command Prompt.lnk"), _T("cmd.exe"), _T("Open command prompt")); - CreateShortcut(CSIDL_DESKTOP, _T("winefile.lnk"), _T("winefile.exe"), _T("Launch Winefile")); /* program startmenu shortcuts */ CreateShortcut(CSIDL_PROGRAMS, _T("Command Prompt.lnk"), _T("cmd.exe"), _T("Open command prompt"));

19 years, 2 months

[gvg] 18437: Don't install Winefile icon on desktop, it's already present in the start menu

by gvg＠svn.reactos.com

Don't install Winefile icon on desktop, it's already present in the start menu Modified: trunk/reactos/lib/syssetup/install.c _____ Modified: trunk/reactos/lib/syssetup/install.c --- trunk/reactos/lib/syssetup/install.c 2005-10-14 09:27:30 UTC (rev 18436) +++ trunk/reactos/lib/syssetup/install.c 2005-10-14 09:33:31 UTC (rev 18437) @@ -399,7 +399,6 @@ /* desktop shortcuts */ CreateShortcut(CSIDL_DESKTOP, _T("Command Prompt.lnk"), _T("cmd.exe"), _T("Open command prompt")); - CreateShortcut(CSIDL_DESKTOP, _T("winefile.lnk"), _T("winefile.exe"), _T("Launch Winefile")); /* program startmenu shortcuts */ CreateShortcut(CSIDL_PROGRAMS, _T("Command Prompt.lnk"), _T("cmd.exe"), _T("Open command prompt"));

19 years, 2 months

[gvg] 18436: Merge from trunk. Mike <mikeonthecomputer@gmail.com>:

by gvg＠svn.reactos.com

Merge from trunk. Mike <mikeonthecomputer(a)gmail.com>: Add installation path for VMware 5.5. Fixes bug 907. Modified: branches/ros-branch-0_2_8/reactos/subsys/system/vmwinst/vmwinst.c _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/system/vmwinst/vmwinst.c --- branches/ros-branch-0_2_8/reactos/subsys/system/vmwinst/vmwinst.c 2005-10-14 08:03:14 UTC (rev 18435) +++ branches/ros-branch-0_2_8/reactos/subsys/system/vmwinst/vmwinst.c 2005-10-14 09:27:30 UTC (rev 18436) @@ -41,6 +41,7 @@ static WCHAR DestinationDriversPath[MAX_PATH+1]; static WCHAR CDDrive = L'\0'; +static WCHAR PathToVideoDrivers55[MAX_PATH+1] = L"X:\\program files\\VMware\\VMware Tools\\Drivers\\video\\winnt2k\\32Bit\\"; static WCHAR PathToVideoDrivers45[MAX_PATH+1] = L"X:\\program files\\VMware\\VMware Tools\\Drivers\\video\\winnt2k\\"; static WCHAR PathToVideoDrivers40[MAX_PATH+1] = L"X:\\video\\winnt2k\\"; static WCHAR DestinationPath[MAX_PATH+1]; @@ -223,9 +224,12 @@ if(GetDriveType(Drive) == DRIVE_CDROM) { #endif + PathToVideoDrivers55[0] = Current; PathToVideoDrivers40[0] = Current; PathToVideoDrivers45[0] = Current; - if(SetCurrentDirectory(PathToVideoDrivers45)) + if(SetCurrentDirectory(PathToVideoDrivers55)) + SrcPath = PathToVideoDrivers55; + else if(SetCurrentDirectory(PathToVideoDrivers45)) SrcPath = PathToVideoDrivers45; else if(SetCurrentDirectory(PathToVideoDrivers40)) SrcPath = PathToVideoDrivers40;

19 years, 2 months

[gvg] 18435: Mike <mikeonthecomputer@gmail.com>:

by gvg＠svn.reactos.com

Mike <mikeonthecomputer(a)gmail.com>: Add installation path for VMware 5.5. Fixes bug 907. Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c _____ Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c --- trunk/reactos/subsys/system/vmwinst/vmwinst.c 2005-10-14 00:03:27 UTC (rev 18434) +++ trunk/reactos/subsys/system/vmwinst/vmwinst.c 2005-10-14 08:03:14 UTC (rev 18435) @@ -41,6 +41,7 @@ static WCHAR DestinationDriversPath[MAX_PATH+1]; static WCHAR CDDrive = L'\0'; +static WCHAR PathToVideoDrivers55[MAX_PATH+1] = L"X:\\program files\\VMware\\VMware Tools\\Drivers\\video\\winnt2k\\32Bit\\"; static WCHAR PathToVideoDrivers45[MAX_PATH+1] = L"X:\\program files\\VMware\\VMware Tools\\Drivers\\video\\winnt2k\\"; static WCHAR PathToVideoDrivers40[MAX_PATH+1] = L"X:\\video\\winnt2k\\"; static WCHAR DestinationPath[MAX_PATH+1]; @@ -223,9 +224,12 @@ if(GetDriveType(Drive) == DRIVE_CDROM) { #endif + PathToVideoDrivers55[0] = Current; PathToVideoDrivers40[0] = Current; PathToVideoDrivers45[0] = Current; - if(SetCurrentDirectory(PathToVideoDrivers45)) + if(SetCurrentDirectory(PathToVideoDrivers55)) + SrcPath = PathToVideoDrivers55; + else if(SetCurrentDirectory(PathToVideoDrivers45)) SrcPath = PathToVideoDrivers45; else if(SetCurrentDirectory(PathToVideoDrivers40)) SrcPath = PathToVideoDrivers40;

19 years, 2 months

[robertk] 18434: preparations for Ros 0.2.8-RC1

by robertk＠svn.reactos.com

preparations for Ros 0.2.8-RC1 Modified: branches/ros-branch-0_2_8/reactos/config.template.xml Modified: branches/ros-branch-0_2_8/reactos/include/reactos/version.h _____ Modified: branches/ros-branch-0_2_8/reactos/config.template.xml --- branches/ros-branch-0_2_8/reactos/config.template.xml 2005-10-13 19:13:47 UTC (rev 18433) +++ branches/ros-branch-0_2_8/reactos/config.template.xml 2005-10-14 00:03:27 UTC (rev 18434) @@ -42,4 +42,4 @@ Whether to compile for debugging. No compiler optimizations will be performed. --> -<property name="DBG" value="1" /> +<property name="DBG" value="0" /> _____ Modified: branches/ros-branch-0_2_8/reactos/include/reactos/version.h --- branches/ros-branch-0_2_8/reactos/include/reactos/version.h 2005-10-13 19:13:47 UTC (rev 18433) +++ branches/ros-branch-0_2_8/reactos/include/reactos/version.h 2005-10-14 00:03:27 UTC (rev 18434) @@ -18,11 +18,11 @@ #define __VERSION_H #define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 3 -#define KERNEL_VERSION_PATCH_LEVEL 0 +#define KERNEL_VERSION_MINOR 2 +#define KERNEL_VERSION_PATCH_LEVEL 8 /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ -#define KERNEL_VERSION_BUILD_TYPE L"SVN" +#define KERNEL_VERSION_BUILD_TYPE L"RC1" #endif

19 years, 2 months

[greatlrd] 18433: removed hard-coded comdlg filter from desk.cpl and it now searches for bmp; jpeg; png in windir patch by Christoph_vW see Bug 885

by greatlrd＠svn.reactos.com

removed hard-coded comdlg filter from desk.cpl and it now searches for bmp;jpeg;png in windir patch by Christoph_vW see Bug 885 Modified: trunk/reactos/lib/cpl/desk/background.c Modified: trunk/reactos/lib/cpl/desk/de.rc Modified: trunk/reactos/lib/cpl/desk/en.rc Modified: trunk/reactos/lib/cpl/desk/resource.h _____ Modified: trunk/reactos/lib/cpl/desk/background.c --- trunk/reactos/lib/cpl/desk/background.c 2005-10-13 18:43:49 UTC (rev 18432) +++ trunk/reactos/lib/cpl/desk/background.c 2005-10-13 19:13:47 UTC (rev 18433) @@ -52,12 +52,13 @@ HIMAGELIST g_hShellImageList = NULL; -/* Add the bitmaps in the C:\ReactOS directory and the current wallpaper if any */ +/* Add the images in the C:\ReactOS directory and the current wallpaper if any */ void AddListViewItems() { WIN32_FIND_DATA fd; HANDLE hFind; TCHAR szSearchPath[MAX_PATH]; + TCHAR szFileTypes[MAX_PATH]; LV_ITEM listItem; LV_COLUMN dummy; RECT clientRect; @@ -151,65 +152,79 @@ RegCloseKey(regKey); - /* Add all the bitmaps in the C:\ReactOS directory. */ + /* Add all the images in the C:\ReactOS directory. */ - GetWindowsDirectory(szSearchPath, MAX_PATH); - _tcscat(szSearchPath, TEXT("\\*.bmp")); - - hFind = FindFirstFile(szSearchPath, &fd); - while(hFind != INVALID_HANDLE_VALUE) - { - /* Don't add any hidden bitmaps */ - if((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) - { - TCHAR filename[MAX_PATH]; - - GetWindowsDirectory(filename, MAX_PATH); + LoadString(hApplet, IDS_SUPPORTED_EXT, szFileTypes, sizeof(szFileTypes) / sizeof(TCHAR)); + + TCHAR separators[] = TEXT(";"); + TCHAR *token; - _tcscat(filename, TEXT("\\")); - _tcscat(filename, fd.cFileName); - - himl = (HIMAGELIST)SHGetFileInfo(filename, - 0, - &sfi, - sizeof(sfi), - SHGFI_SYSICONINDEX | SHGFI_SMALLICON | - SHGFI_DISPLAYNAME); + token = _tcstok ( szFileTypes, separators ); + while ( token != NULL ) + { + GetWindowsDirectory(szSearchPath, MAX_PATH); + _tcscat(szSearchPath, TEXT("\\")); + _tcscat(szSearchPath, token); + + hFind = FindFirstFile(szSearchPath, &fd); + while(hFind != INVALID_HANDLE_VALUE) + { + /* Don't add any hidden bitmaps */ + if((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) + { + TCHAR filename[MAX_PATH]; + + GetWindowsDirectory(filename, MAX_PATH); - if(himl == NULL) - { - break; - } - - if(i++ == 0) - { - g_hShellImageList = himl; - ListView_SetImageList(g_hBackgroundList, himl, LVSIL_SMALL); - } + _tcscat(filename, TEXT("\\")); + _tcscat(filename, fd.cFileName); + + himl = (HIMAGELIST)SHGetFileInfo(filename, + 0, + &sfi, + sizeof(sfi), + SHGFI_SYSICONINDEX | SHGFI_SMALLICON | + SHGFI_DISPLAYNAME); - backgroundItem = &g_backgroundItems[g_listViewItemCount]; + if(himl == NULL) + { + break; + } + + if(i++ == 0) + { + g_hShellImageList = himl; + ListView_SetImageList(g_hBackgroundList, himl, LVSIL_SMALL); + } - backgroundItem->bWallpaper = TRUE; - - _tcscpy(backgroundItem->szDisplayName, sfi.szDisplayName); - _tcscpy(backgroundItem->szFilename, filename); + backgroundItem = &g_backgroundItems[g_listViewItemCount]; - ZeroMemory(&listItem, sizeof(LV_ITEM)); - listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - listItem.pszText = backgroundItem->szDisplayName; - listItem.state = 0; - listItem.iImage = sfi.iIcon; - listItem.iItem = g_listViewItemCount; - listItem.lParam = g_listViewItemCount; - - ListView_InsertItem(g_hBackgroundList, &listItem); - - g_listViewItemCount++; - } - - if(!FindNextFile(hFind, &fd)) - hFind = INVALID_HANDLE_VALUE; - } + backgroundItem->bWallpaper = TRUE; + + _tcscpy(backgroundItem->szDisplayName, sfi.szDisplayName); + _tcscpy(backgroundItem->szFilename, filename); + + ZeroMemory(&listItem, sizeof(LV_ITEM)); + listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; + listItem.pszText = backgroundItem->szDisplayName; + listItem.state = 0; + listItem.iImage = sfi.iIcon; + listItem.iItem = g_listViewItemCount; + listItem.lParam = g_listViewItemCount; + + ListView_InsertItem(g_hBackgroundList, &listItem); + + g_listViewItemCount++; + } + + if(!FindNextFile(hFind, &fd)) + hFind = INVALID_HANDLE_VALUE; + } + + token = _tcstok ( NULL, separators ); + } + + } void InitBackgroundDialog() @@ -293,6 +308,7 @@ OPENFILENAME ofn; TCHAR filename[MAX_PATH]; TCHAR fileTitle[256]; + TCHAR filter[MAX_PATH]; BackgroundItem *backgroundItem = NULL; ZeroMemory(&ofn, sizeof(OPENFILENAME)); @@ -300,12 +316,14 @@ ofn.lStructSize = sizeof(OPENFILENAME); ofn.hwndOwner = g_hBackgroundPage; ofn.lpstrFile = filename; + + LoadString(hApplet, IDS_BACKGROUND_COMDLG_FILTER, filter, sizeof(filter) / sizeof(TCHAR)); /* Set lpstrFile[0] to '\0' so that GetOpenFileName does not * use the contents of szFile to initialize itself */ ofn.lpstrFile[0] = TEXT('\0'); ofn.nMaxFile = MAX_PATH; - ofn.lpstrFilter = TEXT("Bitmap Files (*.bmp)\0*.bmp\0"); + ofn.lpstrFilter = filter; ofn.nFilterIndex = 0; ofn.lpstrFileTitle = fileTitle; ofn.nMaxFileTitle = 256; _____ Modified: trunk/reactos/lib/cpl/desk/de.rc --- trunk/reactos/lib/cpl/desk/de.rc 2005-10-13 18:43:49 UTC (rev 18432) +++ trunk/reactos/lib/cpl/desk/de.rc 2005-10-13 19:13:47 UTC (rev 18433) @@ -78,3 +78,9 @@ IDS_COLOR_32BIT "True Color (32 Bit)" IDS_PIXEL "%lux%lu Pixel" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Bilddateien (*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0" + IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png" +END _____ Modified: trunk/reactos/lib/cpl/desk/en.rc --- trunk/reactos/lib/cpl/desk/en.rc 2005-10-13 18:43:49 UTC (rev 18432) +++ trunk/reactos/lib/cpl/desk/en.rc 2005-10-13 19:13:47 UTC (rev 18433) @@ -102,3 +102,9 @@ IDS_COLOR_32BIT "True Color (32 Bit)" IDS_PIXEL "%lux%lu Pixel" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Pictures (*.bmp;*.jpg;*.dib;*.png)\0*.bmp;*.jpg;*.jpeg;*.dib;*.png\0" + IDS_SUPPORTED_EXT "*.jpg;*.jpeg;*.bmp;*.dib;*.png" +END _____ Modified: trunk/reactos/lib/cpl/desk/resource.h --- trunk/reactos/lib/cpl/desk/resource.h 2005-10-13 18:43:49 UTC (rev 18432) +++ trunk/reactos/lib/cpl/desk/resource.h 2005-10-13 19:13:47 UTC (rev 18433) @@ -27,6 +27,8 @@ #define IDC_BROWSE_BUTTON 1002 #define IDC_COLOR_BUTTON 1003 #define IDC_PLACEMENT_COMBO 1004 +#define IDS_BACKGROUND_COMDLG_FILTER 1005 +#define IDS_SUPPORTED_EXT 1006 /* Screensaver Page */ #define IDC_SCREENS_CHOICES 1010

19 years, 2 months

[gvg] 18432: Merge from trunk:

by gvg＠svn.reactos.com

Merge from trunk: Use the pitch provided by FreeType. Fixes bug 894. Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/text.c _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/text.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/text.c 2005-10-13 18:39:30 UTC (rev 18431) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/text.c 2005-10-13 18:43:49 UTC (rev 18432) @@ -1458,7 +1458,7 @@ FT_Face face; FT_GlyphSlot glyph; LONGLONG TextLeft, RealXStart; - ULONG TextTop, pitch, previous, BackgroundLeft; + ULONG TextTop, previous, BackgroundLeft; FT_Bool use_kerning; RECTL DestRect, MaskRect, SpecifiedDestRect; POINTL SourcePoint, BrushOrigin; @@ -1805,9 +1805,6 @@ DPRINT1("WARNING: Failed to render glyph!\n"); goto fail; } - pitch = glyph->bitmap.pitch; - } else { - pitch = glyph->bitmap.width; } if (fuOptions & ETO_OPAQUE) @@ -1845,9 +1842,17 @@ * We should create the bitmap out of the loop at the biggest possible * glyph size. Then use memset with 0 to clear it and sourcerect to * limit the work of the transbitblt. + * + * FIXME: DIB bitmaps should have an lDelta which is a multiple of 4. + * Here we pass in the pitch from the FreeType bitmap, which is not + * guaranteed to be a multiple of 4. If it's not, we should expand + * the FreeType bitmap to a temporary bitmap. */ - HSourceGlyph = EngCreateBitmap(bitSize, pitch, (glyph->bitmap.pixel_mode == ft_pixel_mode_grays) ? BMF_8BPP : BMF_1BPP, BMF_TOPDOWN, glyph->bitmap.buffer); + HSourceGlyph = EngCreateBitmap(bitSize, glyph->bitmap.pitch, + (glyph->bitmap.pixel_mode == ft_pixel_mode_grays) ? + BMF_8BPP : BMF_1BPP, BMF_TOPDOWN, + glyph->bitmap.buffer); if ( !HSourceGlyph ) { DPRINT1("WARNING: EngLockSurface() failed!\n");

19 years, 2 months

[gvg] 18431: svn maintenance

by gvg＠svn.reactos.com

svn maintenance Property changes on: trunk/reactos/lib/vdmdbg ___________________________________________________________________ Name: svn:ignore + GNUmakefile

19 years, 2 months

[fireball] 18430: cmd, taskmgr and userinit translations by FooDerGrosse <kevin_schnabel at gmx.de>

by fireball＠svn.reactos.com

cmd, taskmgr and userinit translations by FooDerGrosse <kevin_schnabel at gmx.de> Modified: trunk/reactos/subsys/system/cmd/De.rc Modified: trunk/reactos/subsys/system/taskmgr/De.rc Added: trunk/reactos/subsys/system/userinit/De.rc Modified: trunk/reactos/subsys/system/userinit/userinit.rc _____ Modified: trunk/reactos/subsys/system/cmd/De.rc --- trunk/reactos/subsys/system/cmd/De.rc 2005-10-13 15:46:32 UTC (rev 18429) +++ trunk/reactos/subsys/system/cmd/De.rc 2005-10-13 17:34:25 UTC (rev 18430) @@ -24,13 +24,13 @@ STRING_ALIAS_HELP, "Setzt, loescht oder zeigt alias.\n\n\ ALIAS [alias=[command]]\n\n\ - alias Name des alias.\n\ + alias Name des Alias.\n\ command Text welcher fuer das alias zugeordnet wird.\n\n\ -Listet alle aliases auf:\n\ +Listet alle Aliase auf:\n\ ALIAS\n\n\ Setzt ein neues oder ueberschreibt ein bestehendes alias:\n\ ALIAS da=dir a:\n\n\ -Loescht ein alias von der alias-Liste:\n\ +Loescht ein Alias von der Alias-Liste:\n\ ALIAS da=" STRING_BEEP_HELP, "Gibt einen beep-Ton durch den PC-Speaker aus.\n\nBEEP" @@ -98,12 +98,12 @@ attr Gibt die Farbattribute fuer die Konsolenausgabe an.\n\ /F fuellte die Konsoleausgabe mit dem Farbattribut\n\n\ Es gibt 3 Moeglickeiten die Farbe festzulegen:\n\ -1) [bright] name on [bright] name (only the first three letters are required)\n\ +1) [bright] name on [bright] name (Nur die 4 ersten Buchstaben sind noetig)\n\ 2) decimal on decimal\n\ 3) two hex digits\n\n\ Farben:\n\ dec hex name dec hex name\n\ -0 0 Black 8 8 Gray(Bright black)\n\ +0 0 Black 8 8 Gray (Bright black)\n\ 1 1 Blue 9 9 Bright Blue\n\ 2 2 Green 10 A Bright Green\n\ 3 3 Cyan 11 B Bright Cyan\n\ @@ -117,7 +117,7 @@ STRING_COPY_HELP2, "Kopiert eine oder mehrere Dateien an eine andere Position.\n\n\ COPY [/V][/Y|/-Y][/A|/B] Quelle [/A|/B]\n\ [+ source [/A|/B] [+ ...]] [destination [/A|/B]]\n\n\ - source SBezeichnet die zu kopierende(n) Datei(en).\n\ + source Bezeichnet die zu kopierende(n) Datei(en).\n\ /A Weist auf eine ASCII-Textdatei hin.\n\ /B Weist auf eine Binaerdatei hin.\n\ destination Bezeichnet das Verzeichnis und/oder Dateinamen der neuen Datei(en).\n\ _____ Modified: trunk/reactos/subsys/system/taskmgr/De.rc --- trunk/reactos/subsys/system/taskmgr/De.rc 2005-10-13 15:46:32 UTC (rev 18429) +++ trunk/reactos/subsys/system/taskmgr/De.rc 2005-10-13 17:34:25 UTC (rev 18430) @@ -697,12 +697,12 @@ IDS_MSG_ACCESSPROCESSAFF "Unable to Access or Set Process Affinity" IDS_MSG_PROCESSONEPRO "Der Prozess muss eine Zugeh÷rigkeit zu mindestens einem Prozessor aufweisen." IDS_MSG_INVALIDOPTION "Ung³ltige Auswahl" - IDS_MSG_UNABLEDEBUGPROCESS "Unable to Debug Process" + IDS_MSG_UNABLEDEBUGPROCESS "Kann Prozess nicht debuggen" IDS_MSG_WARNINGDEBUG "WARNUNG: Das Debuggen dieses Prozesses kann zu Datenverlust f³hren.\nSind Sie sicher, dass Sie diesen Prozess debuggen m÷chten?" IDS_MSG_TASKMGRWARNING "Warnung vom Task-Manager" IDS_MSG_WARNINGTERMINATING "WARNUNG: Das Abbrechen eines Prozesses kann zu\nunerw³nschten Ergebnissen, einschlie?lich Datenverlust und\nSysteminstabilitõt, f³hren. Zustand und Daten des Prozesses\nwerden nicht mher gespeichert. Sind Sie sicher, dass Sie\nden Prozess abbrechen m÷chten?" - IDS_MSG_UNABLETERMINATEPRO "Unable to Terminate Process" - IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" + IDS_MSG_UNABLETERMINATEPRO "Kann den Prozess nicht beenden" + IDS_MSG_UNABLECHANGEPRIORITY "Kann die Prioritñt nicht ñndern" IDS_MSG_WARNINGCHANGEPRIORITY "WARNUNG: Das ?ndern der Prioritõtsklasse dieses Prozesses\nkann zu unerw³nschten Ergebnissen, einschl. Systeminstabilitõt, f³hren.\nSind Sie sicher, dass Sie õndern m÷chten?" IDS_MSG_TRAYICONCPUUSAGE "CPU-Auslastung: %d%%" IDS_STATUS_MEMUSAGE "zugesicherter Speicher: %dK / %dK" _____ Added: trunk/reactos/subsys/system/userinit/De.rc --- trunk/reactos/subsys/system/userinit/De.rc 2005-10-13 15:46:32 UTC (rev 18429) +++ trunk/reactos/subsys/system/userinit/De.rc 2005-10-13 17:34:25 UTC (rev 18430) @@ -0,0 +1,9 @@ +#include "resource.h" + +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +STRINGTABLE DISCARDABLE +{ + +STRING_USERINIT_FAIL, "Userinit konnte die Shell nicht starten!\n" + +} Property changes on: trunk/reactos/subsys/system/userinit/De.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/userinit/userinit.rc --- trunk/reactos/subsys/system/userinit/userinit.rc 2005-10-13 15:46:32 UTC (rev 18429) +++ trunk/reactos/subsys/system/userinit/userinit.rc 2005-10-13 17:34:25 UTC (rev 18430) @@ -6,5 +6,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "userinit.dll\0" #include <reactos/version.rc> +#include "De.rc" #include "En.rc" #include "Sv.rc"

19 years, 2 months

[gvg] 18429: Integrate translation check script into website

by gvg＠svn.reactos.com

Integrate translation check script into website Modified: trunk/web/reactos.org/scripts/RosResCheck.pl _____ Modified: trunk/web/reactos.org/scripts/RosResCheck.pl --- trunk/web/reactos.org/scripts/RosResCheck.pl 2005-10-13 15:45:27 UTC (rev 18428) +++ trunk/web/reactos.org/scripts/RosResCheck.pl 2005-10-13 15:46:32 UTC (rev 18429) @@ -46,7 +46,7 @@ my $path = "$dir/$file"; $path =~ s/^\.\///; - my $url = "http://svn.reactos.com/viewcvs/trunk/reactos/$path"; + my $url = "http://svn.reactos.org/viewcvs/trunk/reactos/$path"; print "<tr>\n"; print "<td><a href='$url'>$path</a></td>\n"; @@ -64,22 +64,49 @@ } } -print "<html>\n"; -print "<head>\n"; -print "<title>Resources to update</title>\n"; -print "</head>\n"; +sub generate_content +{ + print '<h1><a href="http://www.reactos.org/xhtml/en/dev.html">'; + print "ReactOS Development</a> > Resource translation status</h1>\n"; + print "<h2>Resource translation status</h2>\n"; -print "<body>\n"; -print "<table border='1'>\n"; + open(SVNINVOKE, "svn info . |"); + my @props = <SVNINVOKE>; + close(SVNINVOKE); + + print "<h3>Last update: "; + system "date"; + # pick out the appropriate property + my ($propline) = grep { $_ =~ /Last Changed Rev: / } @props; + if ($propline =~ /Last Changed Rev: (\d+)/) + { + print " (revision $1)"; + } + print "</h3>\n"; + + print "<table border='1'>\n"; + + print "<tr>\n"; + print "<td>File</td>\n"; + print "<td>Rev</td>\n"; + print "<td>En.rc Rev</td>\n"; + print "</tr>\n"; + + check_dir('.'); +} -print "<tr>\n"; -print "<td>File</td>\n"; -print "<td>Rev</td>\n"; -print "<td>En.rc Rev</td>\n"; -print "</tr>\n"; - -check_dir('.'); - -print "</table>\n"; -print "</body>\n"; -print "</html>\n"; +open(TEMPLATE, '../../htdocs/xhtml/en/dev_template.html' ); +while (<TEMPLATE>) +{ + s/Template title/Resource translation status/; +# s/^\/\/extramessage$/$extramessage/; + if ($_ =~ '') + { + generate_content(); + } + else + { + print "$_"; + } +} +close(TEMPLATE);

19 years, 2 months

← Newer
1
...
46
47
48
49
50
51
52
...
74
Older →

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 October 2005