Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[greatlrd] 27656: fixing the limit of hover maxium time for SPI_SETMOUSEHOVERTIME see msdn : http://msdn2.microsoft.com/en-us/library/ms724947.aspx
by greatlrd＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: greatlrd Date: Sat Jul 14 17:56:24 2007 New Revision: 27656 URL: http://svn.reactos.org/svn/reactos?rev=27656&view=rev Log: fixing the limit of hover maxium time for SPI_SETMOUSEHOVERTIME see msdn : http://msdn2.microsoft.com/en-us/library/ms724947.aspx Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Sat Jul 14 17:56:24 2007 @@ -1062,13 +1062,24 @@ *((UINT*)pvParam) = CurInfo->MouseHoverTime; break; case SPI_SETMOUSEHOVERTIME: + /* see http://msdn2.microsoft.com/en-us/library/ms724947.aspx + * copy text from it, if some agument why xp and 2003 behovir diffent + * only if they do not have SP install + * " Windows Server 2003 and Windows XP: The operating system does not + * enforce the use of USER_TIMER_MAXIMUM and USER_TIMER_MINIMUM until + * Windows Server 2003 SP1 and Windows XP SP2 " + */ CurInfo = IntGetSysCursorInfo(WinStaObject); CurInfo->MouseHoverTime = uiParam; if(CurInfo->MouseHoverTime < USER_TIMER_MINIMUM) { CurInfo->MouseHoverTime = USER_TIMER_MINIMUM; } - /* FIXME limit the maximum time to 1000 ms? */ + if(CurInfo->MouseHoverTime > USER_TIMER_MAXIMUM) + { + CurInfo->MouseHoverTime = USER_TIMER_MAXIMUM; + } + break; case SPI_GETMOUSEHOVERWIDTH: CurInfo = IntGetSysCursorInfo(WinStaObject);

1 0

[dreimer] 27655: Changed back to C:\RosBE as default folder. NonAdmin Account users need to set another one. Tried to simplify WriteEnvStr.nsh a bit.
by dreimer＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: dreimer Date: Sat Jul 14 17:31:45 2007 New Revision: 27655 URL: http://svn.reactos.org/svn/reactos?rev=27655&view=rev Log: Changed back to C:\RosBE as default folder. NonAdmin Account users need to set another one. Tried to simplify WriteEnvStr.nsh a bit. Modified: trunk/tools/RosBE-Windows/RosBE.nsi trunk/tools/RosBE-Windows/WriteEnvStr.nsh Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Sat Jul 14 17:31:45 2007 @@ -10,7 +10,7 @@ ;; Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" OutFile "RosBE-${PRODUCT_VERSION}.exe" -InstallDir "$PROFILE\RosBE" +InstallDir "C:\RosBE" InstallDirRegKey HKCU "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show ShowUnInstDetails show @@ -252,7 +252,7 @@ Return ${else} messageBox MB_OK|MB_ICONEXCLAMATION \ - "You do not have administrative privileges. Installing on NonAdmin Account is working now, but it's not tested well yet. NO Vista Support possible!" + "You do not have administrative privileges. You need to set a folder with writing rights to install your BE and Code to. NO Vista Support possible!" Return ${EndIf} FunctionEnd Modified: trunk/tools/RosBE-Windows/WriteEnvStr.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/WriteEnvStr.ns… ============================================================================== --- trunk/tools/RosBE-Windows/WriteEnvStr.nsh (original) +++ trunk/tools/RosBE-Windows/WriteEnvStr.nsh Sat Jul 14 17:31:45 2007 @@ -26,7 +26,13 @@ Call IsNT Pop $2 ${if} $2 == "1" - goto WriteEnvStr_NT + WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $1 + SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \ + 0 "STR:Environment" /TIMEOUT=5000 + Pop $2 + Pop $0 + Pop $1 + Return ${endif} ; Not on NT StrCpy $2 $WINDIR 2 ; Copy drive of windows (c:) @@ -35,14 +41,6 @@ FileWrite $2 "$\r$\nSET $0=$1$\r$\n" FileClose $2 SetRebootFlag true - Goto WriteEnvStr_done - - WriteEnvStr_NT: - WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $1 - SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \ - 0 "STR:Environment" /TIMEOUT=5000 - - WriteEnvStr_done: Pop $2 Pop $0 Pop $1 @@ -67,7 +65,16 @@ Call un.IsNT Pop $1 ${if} $1 == "1" - goto DeleteEnvStr_NT + DeleteRegValue ${WriteEnvStr_RegKey} $0 + SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \ + 0 "STR:Environment" /TIMEOUT=5000 + Pop $5 + Pop $4 + Pop $3 + Pop $2 + Pop $1 + Pop $0 + Return ${endif} ; Not on NT StrCpy $1 $WINDIR 2 @@ -97,14 +104,6 @@ Delete "$1\autoexec.bat" CopyFiles /SILENT $4 "$1\autoexec.bat" Delete $4 - Goto DeleteEnvStr_done - - DeleteEnvStr_NT: - DeleteRegValue ${WriteEnvStr_RegKey} $0 - SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \ - 0 "STR:Environment" /TIMEOUT=5000 - - DeleteEnvStr_done: Pop $5 Pop $4 Pop $3

1 0

[greatlrd] 27654: Patch by David Lenon <DavidL@126.com>: fixing some spi that was retutring using wrong param in retutin and setting spi ------------------------------------------------------------------------------- 1. I did add formating of the code and two debug msg. so it getting easy debug waxdragon crashs
by greatlrd＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: greatlrd Date: Sat Jul 14 17:18:25 2007 New Revision: 27654 URL: http://svn.reactos.org/svn/reactos?rev=27654&view=rev Log: Patch by David Lenon <DavidL(a)126.com>: fixing some spi that was retutring using wrong param in retutin and setting spi ------------------------------------------------------------------------------- 1. I did add formating of the code and two debug msg. so it getting easy debug waxdragon crashs Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Sat Jul 14 17:18:25 2007 @@ -1009,7 +1009,7 @@ *((UINT*)pvParam) = WinStaObject->FlatMenu; break; case SPI_SETFLATMENU: - WinStaObject->FlatMenu = uiParam; + WinStaObject->FlatMenu = (BOOL)pvParam; break; case SPI_GETSCREENSAVETIMEOUT: ASSERT(pvParam); @@ -1100,7 +1100,7 @@ break; case SPI_SETMOUSESPEED: CurInfo = IntGetSysCursorInfo(WinStaObject); - CurInfo->MouseSpeed = uiParam; + CurInfo->MouseSpeed = (UINT)pvParam; /* Limit value to 1...20 range */ if(CurInfo->MouseSpeed < 1) { @@ -1163,14 +1163,11 @@ /* delete the old wallpaper */ NtGdiDeleteObject(hOldBitmap); } - + /* Set the style */ - /*default value is center */ WinStaObject->WallpaperMode = wmCenter; - - - + /* Get a handle to the current users settings */ RtlFormatCurrentUserKeyPath(&KeyPath); InitializeObjectAttributes(&ObjectAttributes,&KeyPath,OBJ_CASE_INSENSITIVE,NULL,NULL); @@ -1216,7 +1213,7 @@ ExFreePool(KeyValuePartialInfo); return FALSE; } - + Tile.Length = KeyValuePartialInfo->DataLength; Tile.MaximumLength = KeyValuePartialInfo->DataLength; Tile.Buffer = (PWSTR)KeyValuePartialInfo->Data; @@ -1227,12 +1224,12 @@ TileNum = 0; } ExFreePool(KeyValuePartialInfo); - + /* start over again and look for the style*/ ResLength = 0; Status = ZwQueryValueKey(KeyHandle, &Style, KeyValuePartialInformation, 0, 0, &ResLength); - + ResLength += sizeof(KEY_VALUE_PARTIAL_INFORMATION); KeyValuePartialInfo = ExAllocatePoolWithTag(PagedPool, ResLength, TAG_STRING); Length = ResLength; @@ -1251,7 +1248,7 @@ ExFreePool(KeyValuePartialInfo); return FALSE; } - + Style.Length = KeyValuePartialInfo->DataLength; Style.MaximumLength = KeyValuePartialInfo->DataLength; Style.Buffer = (PWSTR)KeyValuePartialInfo->Data; @@ -1262,11 +1259,11 @@ StyleNum = 0; } ExFreePool(KeyValuePartialInfo); - + /* Check the values we found in the registry */ if(TileNum && !StyleNum) { - WinStaObject->WallpaperMode = wmTile; + WinStaObject->WallpaperMode = wmTile; } else if(!TileNum && StyleNum == 2) { @@ -1278,10 +1275,10 @@ } case SPI_GETDESKWALLPAPER: /* This function expects different parameters than the user mode version! - We basically return the current wallpaper handle - if any. The user mode version should load the string from the registry and return it without calling this function */ + ASSERT(pvParam); *(HBITMAP*)pvParam = (HBITMAP)WinStaObject->hbmWallpaper; break; @@ -1449,6 +1446,10 @@ ) { NTSTATUS Status = STATUS_SUCCESS; + + /* remove this when all spi are implement */ + DPRINT1("UserSystemParametersInfo_StructSet SPI Action 0x%x (uiParam: 0x%x, fWinIni: 0x%x)\n",uiAction, uiParam, fWinIni); + _SEH_TRY { ProbeForRead(pvParam, cbSize, 1); @@ -1483,6 +1484,10 @@ ) { NTSTATUS Status = STATUS_SUCCESS; + + /* remove this when all spi are implement */ + DPRINT1("UserSystemParametersInfo_StructGet SPI Action 0x%x (uiParam: 0x%x, fWinIni: 0x%x)\n",uiAction, uiParam, fWinIni); + _SEH_TRY { ProbeForRead(pvParam, cbSize, 1); @@ -1551,19 +1556,13 @@ case SPI_SETICONS: case SPI_SETSCREENSAVETIMEOUT: case SPI_SETSCREENSAVEACTIVE: - case SPI_SETFLATMENU: - case SPI_SETSCREENSAVERRUNNING: case SPI_SETDOUBLECLKWIDTH: case SPI_SETDOUBLECLKHEIGHT: case SPI_SETDOUBLECLICKTIME: - case SPI_SETGRADIENTCAPTIONS: case SPI_SETFONTSMOOTHING: - case SPI_SETFOCUSBORDERHEIGHT: - case SPI_SETFOCUSBORDERWIDTH: case SPI_SETMOUSEHOVERTIME: case SPI_SETMOUSEHOVERWIDTH: case SPI_SETMOUSEHOVERHEIGHT: - case SPI_SETMOUSESPEED: case SPI_SETMOUSETRAILS: case SPI_SETSNAPTODEFBUTTON: case SPI_SETBEEP: @@ -1571,26 +1570,37 @@ case SPI_SETKEYBOARDDELAY: case SPI_SETKEYBOARDPREF: case SPI_SETKEYBOARDSPEED: - case SPI_SETLANGTOGGLE: case SPI_SETMOUSEBUTTONSWAP: case SPI_SETWHEELSCROLLLINES: case SPI_SETMENUSHOWDELAY: - case SPI_SETMENUFADE: case SPI_SETMENUDROPALIGNMENT: case SPI_SETICONTITLEWRAP: case SPI_SETCURSORS: case SPI_SETDESKPATTERN: + case SPI_SETBORDER: + case SPI_SETDRAGHEIGHT: + case SPI_SETDRAGWIDTH: + case SPI_SETSHOWIMEUI: + case SPI_SETSCREENREADER: + case SPI_SETSHOWSOUNDS: + return IntSystemParametersInfo(uiAction, uiParam, NULL, fWinIni); + + /* NOTICE: from the IntSystemParametersInfo implementation it uses pvParam */ + case SPI_SETSCREENSAVERRUNNING: + case SPI_SETFLATMENU: + case SPI_SETMOUSESPEED: + case SPI_SETGRADIENTCAPTIONS: + case SPI_SETFOCUSBORDERHEIGHT: + case SPI_SETFOCUSBORDERWIDTH: + case SPI_SETLANGTOGGLE: + case SPI_SETMENUFADE: case SPI_SETDROPSHADOW: case SPI_SETACTIVEWINDOWTRACKING: case SPI_SETACTIVEWNDTRKZORDER: case SPI_SETACTIVEWNDTRKTIMEOUT: - case SPI_SETBORDER: case SPI_SETCARETWIDTH: - case SPI_SETDRAGHEIGHT: - case SPI_SETDRAGWIDTH: case SPI_SETFOREGROUNDFLASHCOUNT: case SPI_SETFOREGROUNDLOCKTIMEOUT: - case SPI_SETSHOWIMEUI: case SPI_SETFONTSMOOTHINGORIENTATION: case SPI_SETFONTSMOOTHINGTYPE: case SPI_SETFONTSMOOTHINGCONTRAST: @@ -1607,17 +1617,17 @@ case SPI_SETMOUSECLICKLOCK: case SPI_SETMOUSESONAR: case SPI_SETMOUSEVANISH: - case SPI_SETSCREENREADER: - case SPI_SETSHOWSOUNDS: - { - return IntSystemParametersInfo(uiAction, uiParam, NULL, fWinIni); - } + return IntSystemParametersInfo(uiAction, 0, pvParam, fWinIni); + + /* Get SPI msg here */ + #if 1 /* only for 32bit applications */ case SPI_GETLOWPOWERACTIVE: case SPI_GETLOWPOWERTIMEOUT: case SPI_GETPOWEROFFACTIVE: case SPI_GETPOWEROFFTIMEOUT: -#endif +#endif + case SPI_GETSCREENSAVERRUNNING: case SPI_GETSCREENSAVETIMEOUT: case SPI_GETSCREENSAVEACTIVE: @@ -1665,117 +1675,110 @@ case SPI_GETMOUSEVANISH: case SPI_GETSCREENREADER: case SPI_GETSHOWSOUNDS: - { /* pvParam is PINT,PUINT or PBOOL */ - UINT Ret; - if(!IntSystemParametersInfo(uiAction, uiParam, &Ret, fWinIni)) - { - return( FALSE); - } - _SEH_TRY - { - ProbeForWrite(pvParam, sizeof(UINT ), 1); - *(PUINT)pvParam = Ret; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return( FALSE); - } - return( TRUE); - } + { + /* pvParam is PINT,PUINT or PBOOL */ + UINT Ret; + if(!IntSystemParametersInfo(uiAction, uiParam, &Ret, fWinIni)) + { + return( FALSE); + } + _SEH_TRY + { + ProbeForWrite(pvParam, sizeof(UINT ), 1); + *(PUINT)pvParam = Ret; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return( FALSE); + } + return( TRUE); + } + case SPI_GETACTIVEWNDTRKTIMEOUT: case SPI_GETKEYBOARDSPEED: case SPI_GETCARETWIDTH: case SPI_GETDRAGFULLWINDOWS: case SPI_GETFOREGROUNDFLASHCOUNT: case SPI_GETFOREGROUNDLOCKTIMEOUT: - { /* pvParam is PDWORD */ - DWORD Ret; - if(!IntSystemParametersInfo(uiAction, uiParam, &Ret, fWinIni)) - { - return( FALSE); - } - _SEH_TRY - { - ProbeForWrite(pvParam, sizeof(DWORD ), 1); - *(PDWORD)pvParam = Ret; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return( FALSE); - } - return( TRUE); - } + { + /* pvParam is PDWORD */ + DWORD Ret; + if(!IntSystemParametersInfo(uiAction, uiParam, &Ret, fWinIni)) + { + return( FALSE); + } + _SEH_TRY + { + ProbeForWrite(pvParam, sizeof(DWORD ), 1); + *(PDWORD)pvParam = Ret; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return( FALSE); + } + return( TRUE); + } case SPI_GETICONMETRICS: - { - ICONMETRICSW Buffer; - return UserSystemParametersInfo_StructGet(uiAction, uiParam, pvParam, fWinIni, - &Buffer,sizeof(Buffer)); - } + { + ICONMETRICSW Buffer; + return UserSystemParametersInfo_StructGet(uiAction, uiParam, pvParam, fWinIni, &Buffer,sizeof(Buffer)); + } case SPI_SETICONMETRICS: - { - ICONMETRICSW Buffer; - return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni, - &Buffer,sizeof(Buffer)); - } + { + ICONMETRICSW Buffer; + return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni, &Buffer,sizeof(Buffer)); + } case SPI_GETMINIMIZEDMETRICS: - { - MINIMIZEDMETRICS Buffer; - return UserSystemParametersInfo_StructGet(uiAction, uiParam, pvParam, fWinIni, - &Buffer,sizeof(Buffer)); - } - case SPI_SETMINIMIZEDMETRICS: - { - MINIMIZEDMETRICS Buffer; - return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni, - &Buffer,sizeof(Buffer)); - } + { + MINIMIZEDMETRICS Buffer; + return UserSystemParametersInfo_StructGet(uiAction, uiParam, pvParam, fWinIni,&Buffer,sizeof(Buffer)); + } + case SPI_SETMINIMIZEDMETRICS: + { + MINIMIZEDMETRICS Buffer; + return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni,&Buffer,sizeof(Buffer)); + } case SPI_GETNONCLIENTMETRICS: { - NONCLIENTMETRICSW Buffer; - return UserSystemParametersInfo_StructGet(uiAction, uiParam, pvParam, fWinIni, - &Buffer,sizeof(Buffer)); + NONCLIENTMETRICSW Buffer; + return UserSystemParametersInfo_StructGet(uiAction, uiParam, pvParam, fWinIni, &Buffer,sizeof(Buffer)); } case SPI_SETNONCLIENTMETRICS: { NONCLIENTMETRICSW Buffer; - return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni, - &Buffer,sizeof(Buffer)); + return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni, &Buffer,sizeof(Buffer)); } case SPI_GETANIMATION: { - ANIMATIONINFO Buffer; - return UserSystemParametersInfo_StructGet(uiAction, uiParam, pvParam, fWinIni, - &Buffer,sizeof(Buffer)); + ANIMATIONINFO Buffer; + return UserSystemParametersInfo_StructGet(uiAction, uiParam, pvParam, fWinIni, &Buffer,sizeof(Buffer)); } case SPI_SETANIMATION: { - ANIMATIONINFO Buffer; - return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni, - &Buffer,sizeof(Buffer)); + ANIMATIONINFO Buffer; + return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni, &Buffer,sizeof(Buffer)); } case SPI_GETACCESSTIMEOUT: { ACCESSTIMEOUT Buffer; - return UserSystemParametersInfo_StructGet(uiAction, uiParam, pvParam, fWinIni, - &Buffer,sizeof(Buffer)); + return UserSystemParametersInfo_StructGet(uiAction, uiParam, pvParam, fWinIni, &Buffer,sizeof(Buffer)); } case SPI_SETACCESSTIMEOUT: { ACCESSTIMEOUT Buffer; - return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni, - &Buffer,sizeof(Buffer)); + return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni, &Buffer,sizeof(Buffer)); } case SPI_GETFILTERKEYS: { @@ -1792,26 +1795,22 @@ case SPI_GETSTICKYKEYS: { STICKYKEYS Buffer; - return UserSystemParametersInfo_StructGet(uiAction, uiParam, pvParam, fWinIni, - &Buffer,sizeof(Buffer)); + return UserSystemParametersInfo_StructGet(uiAction, uiParam, pvParam, fWinIni, &Buffer,sizeof(Buffer)); } case SPI_SETSTICKYKEYS: { STICKYKEYS Buffer; - return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni, - &Buffer,sizeof(Buffer)); + return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni, &Buffer,sizeof(Buffer)); } case SPI_GETTOGGLEKEYS: { TOGGLEKEYS Buffer; - return UserSystemParametersInfo_StructGet(uiAction, uiParam, pvParam, fWinIni, - &Buffer,sizeof(Buffer)); + return UserSystemParametersInfo_StructGet(uiAction, uiParam, pvParam, fWinIni, &Buffer,sizeof(Buffer)); } case SPI_SETTOGGLEKEYS: { TOGGLEKEYS Buffer; - return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni, - &Buffer,sizeof(Buffer)); + return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni, &Buffer,sizeof(Buffer)); } case SPI_SETWORKAREA: { @@ -1974,8 +1973,8 @@ return( TRUE); } case SPI_SETDEFAULTINPUTLANG: - case SPI_SETDESKWALLPAPER: /* !!! As opposed to the user mode version this version accepts a handle - to the bitmap! */ + case SPI_SETDESKWALLPAPER: + /* !!! As opposed to the user mode version this version accepts a handle to the bitmap! */ { HANDLE Handle; _SEH_TRY @@ -2031,11 +2030,11 @@ break; } default : - { - SetLastNtError(ERROR_INVALID_PARAMETER); - DPRINT1("Invalid SPI Code: %lx \n",uiAction ); - break; - } + { + SetLastNtError(ERROR_INVALID_PARAMETER); + DPRINT1("Invalid SPI Code: %lx \n",uiAction ); + break; + } } return( FALSE); }

1 0

[dreimer] 27653: Forget thoese gotos
by dreimer＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: dreimer Date: Sat Jul 14 17:03:40 2007 New Revision: 27653 URL: http://svn.reactos.org/svn/reactos?rev=27653&view=rev Log: Forget thoese gotos Modified: trunk/tools/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Sat Jul 14 17:03:40 2007 @@ -227,53 +227,42 @@ "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \ "DisplayVersion" ${If} $R1 == "${PRODUCT_VERSION}" - goto SameVersion + messageBox MB_OK|MB_ICONEXCLAMATION \ + "You already have the ${PRODUCT_NAME} v${PRODUCT_VERSION} installed. Please manually uninstall the ${PRODUCT_NAME} v${PRODUCT_VERSION} if you want to reinstall." + Quit ${EndIf} ${If} $R0 == "" - goto NoPreviousVersion + Return ${EndIf} MessageBox MB_YESNO|MB_ICONQUESTION \ "A previous version of the ${PRODUCT_NAME} was found. You must uninstall it before installing this version.$\n$\nDo you want to do that now?" \ IDNO UninstallPrevious_no \ IDYES UninstallPrevious_yes Abort - SameVersion: - messageBox MB_OK|MB_ICONEXCLAMATION \ - "You already have the ${PRODUCT_NAME} v${PRODUCT_VERSION} installed. Please manually uninstall the ${PRODUCT_NAME} v${PRODUCT_VERSION} if you want to reinstall." - Quit UninstallPrevious_no: Quit UninstallPrevious_yes: ExecWait '$R0 _?=$INSTDIR' - NoPreviousVersion: FunctionEnd Function CheckAdminOrCurrent userInfo::getAccountType pop $R0 ${If} $R0 == "Admin" - goto IsAdmin + Return ${else} - goto IsNotAdmin - ${EndIf} - IsAdmin: - Return - IsNotAdmin: messageBox MB_OK|MB_ICONEXCLAMATION \ - "You do not have administrative privileges. Installing on NonAdmin Account is working now, but it's not tested well yet. NO Vista Support possible!" - Return + "You do not have administrative privileges. Installing on NonAdmin Account is working now, but it's not tested well yet. NO Vista Support possible!" + Return + ${EndIf} FunctionEnd Function un.CheckAdminOrCurrent userInfo::getAccountType pop $R0 ${If} $R0 == "Admin" - goto IsAdmin + Return ${else} - goto IsNotAdmin - ${EndIf} - IsAdmin: - Return - IsNotAdmin: - Return -FunctionEnd + Return + ${EndIf} +FunctionEnd

1 0

[dreimer] 27652: - Use LogicLib in NSIS Scripts. - Fix a bug in reladdr2line.cmd. (NO I still have no idea what it does and how to merge.)
by dreimer＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: dreimer Date: Sat Jul 14 16:48:37 2007 New Revision: 27652 URL: http://svn.reactos.org/svn/reactos?rev=27652&view=rev Log: - Use LogicLib in NSIS Scripts. - Fix a bug in reladdr2line.cmd. (NO I still have no idea what it does and how to merge.) Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE-Windows/RosBE.nsi trunk/tools/RosBE-Windows/WriteEnvStr.nsh Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Sat Jul 14 16:48:37 2007 @@ -12,7 +12,7 @@ for /f "tokens=2" %%i in ('"objdump -p %1 2>NUL | findstr ImageBase"') do SET baseaddr=0x%%i set /a baseaddr += 0x%2 -for /f %%i in ('echoh %baseaddr%"') do set relbase=%%i -raddr2line %1 %relbase% 2>NUL +for /f %%i in ('"echoh %baseaddr%"') do set relbase=%%i +raddr2line "%1" "%relbase%" 2>NUL title ReactOS Build Environment %_VER% Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Sat Jul 14 16:48:37 2007 @@ -34,6 +34,7 @@ !include "MUI.nsh" !include "RosSourceDir.nsh" !include "WriteEnvStr.nsh" +!include "LogicLib.nsh" ;; MUI begin. @@ -225,8 +226,12 @@ ReadRegStr $R1 HKCU \ "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \ "DisplayVersion" - StrCmp $R1 "${PRODUCT_VERSION}" SameVersion - StrCmp $R0 "" NoPreviousVersion + ${If} $R1 == "${PRODUCT_VERSION}" + goto SameVersion + ${EndIf} + ${If} $R0 == "" + goto NoPreviousVersion + ${EndIf} MessageBox MB_YESNO|MB_ICONQUESTION \ "A previous version of the ${PRODUCT_NAME} was found. You must uninstall it before installing this version.$\n$\nDo you want to do that now?" \ IDNO UninstallPrevious_no \ @@ -246,7 +251,11 @@ Function CheckAdminOrCurrent userInfo::getAccountType pop $R0 - strCmp $R0 "Admin" IsAdmin IsNotAdmin + ${If} $R0 == "Admin" + goto IsAdmin + ${else} + goto IsNotAdmin + ${EndIf} IsAdmin: Return IsNotAdmin: @@ -258,7 +267,11 @@ Function un.CheckAdminOrCurrent userInfo::getAccountType pop $R0 - strCmp $R0 "Admin" IsAdmin IsNotAdmin + ${If} $R0 == "Admin" + goto IsAdmin + ${else} + goto IsNotAdmin + ${EndIf} IsAdmin: Return IsNotAdmin: Modified: trunk/tools/RosBE-Windows/WriteEnvStr.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/WriteEnvStr.ns… ============================================================================== --- trunk/tools/RosBE-Windows/WriteEnvStr.nsh (original) +++ trunk/tools/RosBE-Windows/WriteEnvStr.nsh Sat Jul 14 16:48:37 2007 @@ -2,6 +2,7 @@ !define _WriteEnvStr_nsh !include "WinMessages.nsh" +!include "LogicLib.nsh" !ifndef WriteEnvStr_RegKey !define WriteEnvStr_RegKey 'HKCU "Environment"' @@ -24,7 +25,9 @@ Call IsNT Pop $2 - StrCmp $2 1 WriteEnvStr_NT + ${if} $2 == "1" + goto WriteEnvStr_NT + ${endif} ; Not on NT StrCpy $2 $WINDIR 2 ; Copy drive of windows (c:) FileOpen $2 "$2\autoexec.bat" a @@ -63,7 +66,9 @@ Call un.IsNT Pop $1 - StrCmp $1 1 DeleteEnvStr_NT + ${if} $1 == "1" + goto DeleteEnvStr_NT + ${endif} ; Not on NT StrCpy $1 $WINDIR 2 FileOpen $1 "$1\autoexec.bat" r @@ -76,8 +81,12 @@ FileRead $1 $3 StrLen $5 $0 StrCpy $5 $3 $5 - StrCmp $5 $0 DeleteEnvStr_dosLoop - StrCmp $5 "" DeleteEnvStr_dosLoopEnd + ${if} $5 == "$0" + goto DeleteEnvStr_dosLoop + ${endif} + ${if} $5 == "" + goto DeleteEnvStr_dosLoopEnd + ${endif} FileWrite $2 $3 Goto DeleteEnvStr_dosLoop

1 0

[fireball] 27651: Patch by Dmitry Chapyshev <lentind@yandex.ru>: - Fix russian translation.
by fireball＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: fireball Date: Sat Jul 14 16:28:54 2007 New Revision: 27651 URL: http://svn.reactos.org/svn/reactos?rev=27651&view=rev Log: Patch by Dmitry Chapyshev <lentind(a)yandex.ru>: - Fix russian translation. Added: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc (with props) Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/main/lang/ru-RU.rc trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc trunk/reactos/dll/win32/devmgr/devmgr.rc trunk/reactos/dll/win32/newdev/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/shell32_Ru.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ru-RU.rc Sat Jul 14 16:28:54 2007 @@ -9,15 +9,15 @@ GROUPBOX "Çàëèïàíèå êëàâèø",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Ââîä ñî÷åòàíèé ñ êëàâèøàìè Shift, Ctrl èëè Alt ïóòåì ïîñëåäîâàòåëüíîãî íàæàòèÿ êëàâèø.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) AUTOCHECKBOX "&Çàëèïàíèå êëàâèø",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)-12,PROPSHEETPADDING(15),14 - PUSHBUTTON "&Íàñòðîéêà",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + PUSHBUTTON "&Íàñòðîéêà",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(5)+6,PROPSHEETPADDING(15)-5,14 GROUPBOX "Ôèëüòðàöèÿ ââîäà",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 LTEXT "Èãíîðèðîâàíèå ñëó÷àéíûõ êðàòêîâðåìåííûõ èëè ïîâòîðíûõ íàæàòèé êëàâèø.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) AUTOCHECKBOX "Èñïîëüçîâàòü &ôèëüòðàöèþ ââîäà",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)-15,PROPSHEETPADDING(15)+50,14 - PUSHBUTTON "Í&àñòðîéêà",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 + PUSHBUTTON "Í&àñòðîéêà",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(13)+6,PROPSHEETPADDING(15)-5,14 GROUPBOX "Îçâó÷èâàíèå ïåðåêëþ÷åíèÿ ðåæèìîâ",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Îçâó÷èâàíèå íàæàòèÿ êëàâèø ïåðåêëþ÷åíèÿ ðåæèìîâ Caps Lock, Num Lock è Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) AUTOCHECKBOX "&Îçâó÷èâàíèå",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - PUSHBUTTON "Íà&ñòðîéêà",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 + PUSHBUTTON "Íà&ñòðîéêà",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(20)+6,PROPSHEETPADDING(15)-5,14 // AUTOCHECKBOX "&Äîïîëíèòåëüíûå ñâåäåíèÿ î ðàáîòå ñ êëàâèàòóðîé",IDC_KEYBOARD_EXTRA END Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc Sat Jul 14 16:28:54 2007 @@ -30,14 +30,14 @@ COMBOBOX IDC_SCREENS_LIST, 14, 104, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Ïàðàìåòðû",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP PUSHBUTTON "Ï&ðîñìîòð",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "È&íòåðâàë",IDC_WAITTEXT, 14, 125, 33, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 60, 123, 32, 13, ES_RIGHT | WS_GROUP + LTEXT "È&íòåðâàë:",IDC_WAITTEXT, 14, 125, 33, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 55, 121, 32, 13, ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 - LTEXT "ìèí.", IDC_MINTEXT, 95, 125, 26, 9 + LTEXT "ìèí.", IDC_MINTEXT, 90, 125, 20, 9 CONTROL "Íà&÷èíàòü ñ ýêðàíà ïðèâåòñòâèÿ",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP, 116, 118, 115, 23 + BS_AUTOCHECKBOX | WS_TABSTOP, 112, 118, 119, 23 GROUPBOX "&Ýíåðãîñáåðåæåíèå", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 LTEXT "Äëÿ èçìåíåíèÿ ïàðàìåòðîâ ïèòàíèÿ ìîíèòîðà íàæìèòå êíîïêó ""Ïèòàíèå"".", IDC_STATIC, 14, 166, 146 ,20 @@ -68,7 +68,7 @@ LTEXT "Ýëåìåíò:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - LTEXT "&Ðàçìåð", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + LTEXT "&Ðàçìåð:", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 39, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 Modified: trunk/reactos/dll/cpl/main/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/main/lang/ru-RU.rc Sat Jul 14 16:28:54 2007 @@ -135,7 +135,7 @@ LTEXT "Ïîâîðîò êîëåñèêà íà îäèí ùåë÷îê ñëóæèò äëÿ ïðîêðóòêè:", -1, 20, 15, 200, 10 RADIOBUTTON "íà óêàçàííîå êîëè÷åñòâî &ñòðîê:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "íà îäèí &ýêðàí", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 56, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END Modified: trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ru-R… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc Sat Jul 14 16:28:54 2007 @@ -7,9 +7,9 @@ CAPTION "Ñõåìû óïðàâëåíèÿ ïèòàíèåì" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_ACDC, IDI_ACDC, 16,15,32,32 + ICON IDI_ACDC, IDI_ACDC, 5,5,32,32 LTEXT "Âûáåðèòå ñõåìó óïðàâëåíèÿ ýëåêòðîïèòàíèåì ñ íàèáîëåå ïîäõîäÿùèìè ïàðàìåòðàìè äëÿ ýòîãî êîìïüþòåðà. Èçìåíåíèå íèæåñëåäóþùèõ ïàðàìåòðîâ èçìåíèò âûáðàííóþ ñõåìó.", - -1,45,13,194,36 + -1,37,5,194,36 GROUPBOX "&Ñõåìû óïðàâëåíèÿ ïèòàíèåì", -1, 7,57,240,46 COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Ñîõðàíèòü &êàê...", -1, 100,85,75,15,WS_DISABLED @@ -18,7 +18,7 @@ LTEXT "Ïðè ïèòàíèè:",IDC_SAT,15,120,60,10 LTEXT "îò ñåòè",IDC_SAC,100,120,45,15 ICON IDI_AC, IDC_IAC, 75,115,25,15 - LTEXT "îò áàòàðåé",IDC_SDC,197,120,45,15 + LTEXT "îò áàòàðåé",IDC_SDC,190,120,45,15 ICON IDI_DC, IDC_IDC, 165,115,25,15 LTEXT "Îòêëþ÷èòü &ìîíèòîð:",IDC_MONITOR,15,142,80,10 COMBOBOX IDC_MONITORACLIST, 100,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -77,8 +77,8 @@ CAPTION "Äîïîëíèòåëüíî" FONT 8, "MS Sans Serif" BEGIN - ICON IDI_ACDC,IDI_ACDC,16,15,32,32 - LTEXT "Âûáåðèòå æåëàåìûå ïàðàìåòðû ýíåðãîñáåðåæåíèÿ.",-1,45,13,205,20 + ICON IDI_ACDC,IDI_ACDC,5,5,32,32 + LTEXT "Âûáåðèòå æåëàåìûå ïàðàìåòðû ýíåðãîñáåðåæåíèÿ.",-1,37,5,205,20 GROUPBOX "Ïàðàìåòðû",-1,5,35,225,55 CONTROL "&Âñåãäà îòîáðàæàòü çíà÷îê íà ïàíåëè çàäà÷",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,48,200,10 @@ -103,9 +103,9 @@ CAPTION "Ñïÿùèé ðåæèì" FONT 8, "MS Sans Serif" BEGIN - ICON IDI_SCREEN,IDI_SCREEN,16,15,32,32 + ICON IDI_SCREEN,IDI_SCREEN,5,5,32,32 LTEXT "Ïðè ïåðåõîäå â ñïÿùèé ðåæèì êîìïüþòåð ïåðåíîñèò ñîäåðæèìîå îïåðàòèâíîé ïàìÿòè íà äèñê è âûêëþ÷àåòñÿ. Ïðè âûõîäå èç ñïÿùåãî ðåæèìà êîìïüþòåð âîçâðàùàåòñÿ â ïðåæíåå ñîñòîÿíèå.", - -1,45,13,195,35 + -1,37,5,195,35 GROUPBOX "Ñïÿùèé ðåæèì",-1,5,57,235,25 CONTROL "&Ðàçðåøèòü ïåðåõîä â ñïÿùèé ðåæèì",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,67,210,10 @@ -130,7 +130,7 @@ IDS_SIZEBYTS "%i áàéò" IDS_SIZEMB "%i ÌÁ" - IDS_NOACTION "Do nothing" + IDS_NOACTION "Íå äåëàòü íè÷åãî" IDS_PowerActionNone1 "Äåéñòâèå íå òðåáóåòñÿ" IDS_PowerActionUnknown "Íåò äàííûõ" Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgr.rc (original) +++ trunk/reactos/dll/win32/devmgr/devmgr.rc Sat Jul 14 16:28:54 2007 @@ -21,3 +21,4 @@ #include "lang/it-IT.rc" #include "lang/pl-PL.rc" #include "lang/uk-UA.rc" +#include "lang/ru-RU.rc" Added: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc (added) +++ trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc Sat Jul 14 16:28:54 2007 @@ -1,0 +1,169 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_NAME "Èìÿ" + IDS_TYPE "Òèï" + IDS_MANUFACTURER "Èçãîòîâèòåëü: %1" + IDS_LOCATION "Ðàçìåùåíèå: %1" + IDS_STATUS "Ñîñòîÿíèå óñòðîéñòâà: %1" + IDS_UNKNOWN "Íåèçâåñòíî" + IDS_LOCATIONSTR "Ðàçìåùåíèå %1!u! (%2)" + IDS_DEVCODE " (Êîä %1!u!)" + IDS_DEVCODE2 " (Êîä %2!u!)" + IDS_ENABLEDEVICE "Ýòî óñòðîéñòâî èñïîëüçóåòñÿ (âêëþ÷åíî)" + IDS_DISABLEDEVICE "Ýòî óñòðîéñòâî íå èñïîëüçóåòñÿ (âûêëþ÷åíî)" + IDS_UNKNOWNDEVICE "Íåèçâåñòíîå óñòðîéñòâî" + IDS_NODRIVERLOADED "Íå óñòàíîâëåíû äðàéâåðû äëÿ ýòîãî óñòðîéñòâà." + IDS_DEVONPARENT "íà %1" + IDS_TROUBLESHOOTDEV "&Äèàãíîñòèêà..." + IDS_ENABLEDEV "Â&êëþ÷èòü óñòðîéñòâî" + IDS_REINSTALLDRV "&Ïåðåóñòàíîâèòü äðàéâåð" + IDS_PROPERTIES "Ñ&âîéñòâà" + IDS_UPDATEDRV "Î&áíîâèòü äðàéâåð..." + IDS_REBOOT "Ïåð&åçàãðóçèòü êîìïüþòåð..." + IDS_NOTAVAILABLE "Íåäîñòóïíî" + IDS_NOTDIGITALLYSIGNED "Íåò öèôðîâîé ïîäïèñè" + IDS_NODRIVERS "Ôàéëû äðàéâåðîâ äëÿ ýòîãî óñòðîéñòâà íå óñòàíîâëåíû èëè íå áûëè çàãðóæåíû." +END + +/* error messages, source: http://www.z123.org/techsupport/medm.htm */ +STRINGTABLE +BEGIN + IDS_DEV_NO_PROBLEM "This device is working properly." + IDS_DEV_NOT_CONFIGURED "This device is not configured correctly." + IDS_DEV_DEVLOADER_FAILED "ReactOS could not load the driver for this device because the computer is reporting two $1 bus types." + IDS_DEV_DEVLOADER_FAILED2 "The $1 device loader(s) for this device could not load the device driver." + IDS_DEV_OUT_OF_MEMORY "The driver for this device may be bad, or your system may be running low on memory or other resources." + IDS_DEV_ENTRY_IS_WRONG_TYPE "This device is not working properly because one of its drivers may be bad, or your registry may be bad." + IDS_DEV_LACKED_ARBITRATOR "The driver for this device requested a resource that ReactOS does not know how to handle." + IDS_DEV_BOOT_CONFIG_CONFLICT "Another device is using the resources this device needs." + IDS_DEV_FAILED_FILTER "The drivers for this device need to be reinstalled." + IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." + IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." + IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " + IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." + IDS_DEV_LIAR "ReactOS stopped responding while attempting to start this device, and therefore will never attempt to start this device again." + IDS_DEV_NORMAL_CONFLICT "This device cannot find any free $1 resources to use." + IDS_DEV_NOT_VERIFIED "This device is either not present, not working properly, or does not have all the drivers installed." + IDS_DEV_NEED_RESTART "This device cannot work properly until you restart your computer." + IDS_DEV_REENUMERATION "This device is causing a resource conflict." + IDS_DEV_PARTIAL_LOG_CONF "ReactOS could not identify all the resources this device uses." + IDS_DEV_UNKNOWN_RESOURCE "The driver information file $1 is telling this child device to use a resource that the parent device does not have or recognize." + IDS_DEV_REINSTALL "The drivers for this device need to be reinstalled." + IDS_DEV_REGISTRY "Your registry may be bad." + IDS_DEV_WILL_BE_REMOVED "ReactOS is removing this device." + IDS_DEV_DISABLED "This device is not started." + IDS_DEV_DISABLED2 "This device is disabled." + IDS_DEV_DEVLOADER_NOT_READY "The loaders for this device cannot load the required drivers." + IDS_DEV_DEVLOADER_NOT_READY2 "This display adapter is functioning correctly." + IDS_DEV_DEVLOADER_NOT_READY3 "The loaders for this device cannot load the required drivers." + IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." + IDS_DEV_MOVED "ReactOS is in the process of setting up this device." + IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." + IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." + IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." + IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." + IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." + IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." + IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." + IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." + IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS cannot access this hardware because its service key information in the registry is missing or recorded incorrectly." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS successfully loaded the device driver for this hardware but cannot find the hardware device." + IDS_DEV_DUPLICATE_DEVICE "ReactOS cannot load the device driver for this hardware because there is a duplicate device already running in the system." + IDS_DEV_FAILED_POST_START "ReactOS has stopped this device because it has reported problems." + IDS_DEV_HALTED "An application or service has shut down this hardware device." + IDS_DEV_PHANTOM "Currently, this hardware device is not connected to the computer." + IDS_DEV_SYSTEM_SHUTDOWN "ReactOS cannot gain access to this hardware device because the operating system is in the process of shutting down." + IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" + IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." + IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." +END + +IDD_HARDWARE DIALOG DISCARDABLE 0, 0, 300, 400 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Óñòðîéñòâà:",IDC_DEVICES,7,6,196,10 + CONTROL "",IDC_LV_DEVICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,16,196,50 + GROUPBOX "Ñâîéñòâà óñòðîéñòâà",IDC_PROPERTIESGROUP,7,76,196,105 + LTEXT "",IDC_MANUFACTURER,14,88,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_LOCATION,14,100,183,10,SS_ENDELLIPSIS + LTEXT "",IDC_STATUS,14,112,183,30 + PUSHBUTTON "&Äèàãíîñòèêà...",IDC_TROUBLESHOOT,85,140,54,14, + BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "Ñ&âîéñòâà",IDC_PROPERTIES,146,140,50,14 +END + +IDD_DEVICEGENERAL DIALOG DISCARDABLE 0, 0, 252, 218 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Îáùèå" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Òèï óñòðîéñòâà:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVTYPE, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Èçãîòîâèòåëü:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVMANUFACTURER, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Ðàçìåùåíèå:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVLOCATION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + GROUPBOX "Ñîñòîÿíèå óñòðîéñòâà", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 + EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL + PUSHBUTTON "&Äèàãíîñòèêà...", IDC_DEVPROBLEM, 148, 163, 90, 15 + LTEXT "&Ïðèìåíåíèå óñòðîéñòâà:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED + COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED +END + +IDD_DEVICEDRIVER DIALOG DISCARDABLE 0, 0, 252, 218 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Äðàéâåð" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Ïîñòàâùèê äðàéâåðà:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Äàòà ðàçðàáîòêè:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Âåðñèÿ äðàéâåðà:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Öèôðîâàÿ ïîäïèñü:", -1, 37, 81, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "&Ñâåäåíèÿ...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + LTEXT "Ïðîñìîòð ñâåäåíèé î ôàéëàõ äðàéâåðîâ.", -1, 91, 110, 154, 17, SS_NOPREFIX +END + +IDD_DRIVERDETAILS DIALOG DISCARDABLE 0, 0, 224, 250 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Ñâåäåíèÿ î ôàéëàõ äðàéâåðîâ" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "&Ôàéëû äðàéâåðîâ:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LTEXT "Ïîñòàâùèê:", -1, 14, 134, 50, 8 + LTEXT "", IDC_FILEPROVIDER, 66, 134, 155, 8 + LTEXT "Âåðñèÿ ôàéëà:", -1, 14, 150, 50, 8 + LTEXT "", IDC_FILEVERSION, 66, 150, 155, 8 + LTEXT "Àâòîðñêèå ïðàâà:", -1, 14, 166, 50, 8 + LTEXT "", IDC_FILECOPYRIGHT, 66, 166, 155, 8 + LTEXT "Öèôðîâàÿ ïîäïèñü:", -1, 14, 182, 50, 8 + LTEXT "", IDC_DIGITALSIGNER, 66, 182, 155, 8 + PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 +END + Propchange: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/newdev/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/newdev/lang/ru-RU.rc Sat Jul 14 16:28:54 2007 @@ -6,12 +6,12 @@ CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Âàñ ïðèâåòñòâóåò ìàñòåð óñòàíîâêè íîâîãî îáîðóäîâàíèÿ",IDC_WELCOMETITLE,120,8,195,24 + LTEXT "Óñòàíîâêà íîâîãî îáîðóäîâàíèÿ",IDC_WELCOMETITLE,120,8,210,24 LTEXT "Ýòîò ìàñòåð óñòàíàâëèâàåò äðàéâåð äëÿ:", IDC_STATIC,120,21,195,16 LTEXT "Äëÿ ïðîäîëæåíèÿ íàæìèòå êíîïêó ""Äàëåå"".",IDC_STATIC,120,169,195,17 LTEXT "Íåèçâåñòíîå óñòðîéñòâî",IDC_DEVICE,134,36,164,11 - LTEXT "ÂÍÈÌÀÍÈÅ! ÓÑÒÀÍÎÂÊÀ ÍÎÂÎÃÎ ÎÁÎÐÓÄÎÂÀÍÈß ÌÎÆÅÒ ÇÀÊÎÍ×ÈÒÜÑß ÇÀÂÈÑÀÍÈÅÌ ÊÎÌÏÜÞÒÅÐÀ ÈËÈ ÍÅÂÎÇÌÎÆÍÎÑÒÜÞ ÇÀÃÐÓÇÈÒÜ ÅÃÎ!",IDC_STATIC,120,59,195,16 + LTEXT "ÂÍÈÌÀÍÈÅ! Óñòàíîâêà íîâîãî îáîðóäîâàíèÿ ìîæåò çàêîí÷èòüñÿ çàâèñàíèåì êîìïüþòåðà èëè íåâîçìîæíîñòüþ çàãðóçèòü åãî!",IDC_STATIC,120,59,195,25 CONTROL "Óñòàíîâèòü äðàéâåð àâòîìàòè÷åñêè",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "Óñòàíîâèòü äðàéâåð èç óêàçàííîãî ìåñòà",IDC_RADIO_MANUAL, @@ -25,12 +25,12 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ýòî îáîðóäîâàíèå óñòàíîâèòü íå óäàëîñü",IDC_FINISHTITLE,120,8,195,24 - LTEXT "Óñòðîéñòâî íå óñòàíîâëåíî, ïîòîìó ÷òî äðàéâåð íå íàéäåí.", + LTEXT "Îáîðóäîâàíèå íå óñòàíîâëåíî, ïîñêîëüêó ìàñòåð íå ñìîã íàéòè íóæíîãî ïðîãðàììíîãî îáåñïå÷åíèÿ.", IDC_STATIC,120,40,195,19 LTEXT "Åñëè èìåþòñÿ óñòàíîâî÷íûå äèñêè èëè èçâåñòíî ðàñïîëîæåíèå íóæíîãî ïðîãðàììíîãî îáåñïå÷åíèÿ, íàæìèòå êíîïêó ""Íàçàä"".", - IDC_STATIC,120,98,181,24 + IDC_STATIC,120,125,181,24 CONTROL "Áîëüøå íå íàïîìèíàòü îá óñòàíîâêå ýòîãî äðàéâåðà.",IDC_DONOTSHOWDLG,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 + BS_AUTOCHECKBOX | WS_TABSTOP,120,170,190,11 END IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -42,7 +42,7 @@ LTEXT "Ýòî îáîðóäîâàíèå óñòàíîâèòü íå óäàëîñü",IDC_FINISHTITLE,120,8,195,24 LTEXT "Íåèçâåñòíàÿ îøèáêà. Íå óäàëîñü óñòàíîâèòü óñòðîéñòâî.", IDC_STATIC,120,40,195,19 - LTEXT "ÍÅÈÇÂÅÑÒÍÎÅ ÓÑÒÐÎÉÑÒÂÎ",IDC_DEVICE,134,55,164,11 + LTEXT "Íåèçâåñòíîå óñòðîéñòâî",IDC_DEVICE,134,55,164,11 END IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 @@ -88,8 +88,7 @@ LTEXT "Óñòàíîâêà îáîðóäîâàíèÿ çàâåðøåíà",IDC_FINISHTITLE,120,8,195,11 LTEXT "Âû äîëæíû âûïîëíèòü ïåðåçàãðóçêó, ÷òîáû çàêîí÷èòü óñòàíîâêó:", IDC_STATIC,120,32,195,19 - LTEXT "Íàæìèòå ""Ãîòîâî"" äëÿ çàâåðøåíèÿ ìàñòåðà.",IDC_STATIC,120,174, - 179,11 + LTEXT "Íàæìèòå ""Ãîòîâî"" äëÿ çàâåðøåíèÿ ìàñòåðà.",IDC_STATIC,120,174,179,11 LTEXT "Íåèçâåñòíîå óñòðîéñòâî",IDC_DEVICE,148,53,147,12 END Modified: trunk/reactos/dll/win32/shell32/shell32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Ru.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Ru.rc Sat Jul 14 16:28:54 2007 @@ -44,10 +44,10 @@ MENUITEM SEPARATOR POPUP "Âûñòðîèòü &çíà÷êè" BEGIN - MENUITEM "Ïî &Èìåíè", 0x30 /* column 0 */ - MENUITEM "Ïî &Òèïó", 0x32 /* column 2 */ - MENUITEM "Ïî &Ðàçìåðó", 0x31 /* ... */ - MENUITEM "Ïî &Äàòå", 0x33 + MENUITEM "Ïî &èìåíè", 0x30 /* column 0 */ + MENUITEM "Ïî &òèïó", 0x32 /* column 2 */ + MENUITEM "Ïî &ðàçìåðó", 0x31 /* ... */ + MENUITEM "Ïî &äàòå", 0x33 MENUITEM SEPARATOR MENUITEM "&Àâòîìàòè÷åñêè", FCIDM_SHVIEW_AUTOARRANGE END @@ -60,7 +60,7 @@ MENUITEM SEPARATOR POPUP "Ñîçäàòü" BEGIN - MENUITEM "&Ïàïêà", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "&Ïàïêó", FCIDM_SHVIEW_NEWFOLDER MENUITEM "&ßðëûê", FCIDM_SHVIEW_NEWLINK MENUITEM SEPARATOR END @@ -92,7 +92,7 @@ SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK -CAPTION "Îáçîð" +CAPTION "Ïðîâîäíèê" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "Äà", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP @@ -125,8 +125,8 @@ { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE LTEXT "Ââåäèòå èìÿ ïðîãðàììû, ïàïêè, äîêóìåíòà èëè ðåñóðñ Èíòåðíåòà, è ReactOS îòêðîåò èõ.", 12289, 36, 11, 182, 18 - LTEXT "&Îòêðûòü:", 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 + LTEXT "&Îòêðûòü:", 12305, 7, 39, 32, 10 + CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 42, 37, 179, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Îòìåíà", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Îá&çîð...", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc Sat Jul 14 16:28:54 2007 @@ -9,8 +9,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Äîáðî ïîæàëîâàòü â ìàñòåð óñòàíîâêè ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "Ýòîò ìàñòåð óñòàíîâèò ReactOS íà âàø êîìïüþòåð. Ìàñòåð "\ - "ïîìîæåò ââåñòè ñâåäåíèÿ äëÿ ïðàâèëüíîé óñòàíîâêè ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Ýòîò ìàñòåð ïîìîæåò ââåñòè ñâåäåíèÿ äëÿ ïðàâèëüíîé"\ + " óñòàíîâêè ReactOS è óñòàíîâèò åå íà âàø êîìïüþòåð.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Íàæìèòå ""Äàëåå"" äëÿ ïðîäîëæåíèÿ óñòàíîâêè.", IDC_STATIC, 115, 169, 195, 17 END @@ -42,9 +42,9 @@ LTEXT "Ââåäèòå âàøå ïîëíîå èìÿ è íàçâàíèå îðãàíèçàöèè.", IDC_STATIC, 54, 7, 242, 21 LTEXT "&Èìÿ:", IDC_STATIC, 54, 37, 44, 8 - EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 11, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL LTEXT "&Îðãàíèçàöèÿ:", IDC_STATIC, 54, 57, 47, 8 - EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 11, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL END @@ -57,16 +57,16 @@ "Åñëè âàø êîìïüþòåð ïîäêëþ÷åí ê ñåòè, òî åãî èìÿ äîëæíî áûòü óíèêàëüíî.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Èìÿ êîìïüþòåðà:", IDC_STATIC, 54, 38, 75, 8 - EDITTEXT IDC_COMPUTERNAME, 140, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + EDITTEXT IDC_COMPUTERNAME, 140, 35, 163, 11, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE LTEXT "Ïðè óñòàíîâêå áóäåò ñîçäàí ïðîôèëü ïîëüçîâàòåëÿ ñ èìåíåì Administrator "\ "Âû ìîæåòå èñïîëüçîâàòü ýòîò ïðîôèëü, åñëè âàì íóæíî ïîëó÷èòü ïðàâà àäìèíèñòðàòîðà.", IDC_STATIC, 54, 57, 250, 25 LTEXT "Ââåäèòå ïàðîëü àäìèíèñòðàòîðà (íå áîëåå 14 ñèìâîëîâ).", IDC_STATIC, 54, 87, 250, 8 LTEXT "&Ïàðîëü àäìèíèñòðàòîðà:", IDC_STATIC, 54, 104, 110, 8 - EDITTEXT IDC_ADMINPASSWORD1, 140, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + EDITTEXT IDC_ADMINPASSWORD1, 142, 101, 170, 11, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "Ï&îâòîðèòå ïàðîëü:", IDC_STATIC, 54, 123, 75, 8 - EDITTEXT IDC_ADMINPASSWORD2, 140, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + EDITTEXT IDC_ADMINPASSWORD2, 142, 120, 170, 11, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD END @@ -95,12 +95,12 @@ CAPTION "Óñòàíîâêà ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Äàòà è âðåìÿ", IDC_STATIC, 53, 7, 253, 8 + LTEXT "Äàòà è âðåìÿ:", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", - DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 11 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", - DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 - LTEXT "×àñîâîé ïîÿñ", IDC_STATIC, 53, 42, 253, 8 + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 11 + LTEXT "×àñîâîé ïîÿñ:", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Àâ&òîìàòè÷åñêèé ïåðåõîä íà ëåòíåå âðåìÿ è îáðàòíî.", @@ -127,7 +127,7 @@ BEGIN LTEXT "Çàâåðøåíèå ìàñòåðà óñòàíîâêè ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Âû óñïåøíî çàêîí÷èëè óñòàíîâêó ReactOS.\n\n" \ - "Íàæìèòå Çàâåðøèòü äëÿ ïåðåçàãðóçêè âàøåãî êîìïüþòåðà.", IDC_STATIC, 115, 40, 195, 100 + "Íàæìèòå ""Ãîòîâî"" äëÿ ïåðåçàãðóçêè âàøåãî êîìïüþòåðà.", IDC_STATIC, 115, 40, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 LTEXT "Åñëè â CD íàõîäèòñÿ â ïðèâîäå, íóæíî èçâëå÷ü åãî. Äëÿ ïåðåçàãðóçêè "\ "êîìïüþòåðà íàæìèòå ""Ãîòîâî"".", IDC_STATIC, 115, 169, 195, 17 @@ -147,7 +147,7 @@ IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Please wait..." +CAPTION "Ïîæàëóéñòà ïîäîæäèòå..." FONT 8,"MS Shell Dlg 2",400,0,1 BEGIN LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS @@ -156,7 +156,7 @@ STRINGTABLE BEGIN - IDS_ACKTITLE "Ïîäòâåðæäåíèÿ" + IDS_ACKTITLE "Ïîäòâåðæäåíèå ëèöåíçèè" IDS_ACKSUBTITLE "Èíôîðìàöèÿ î ðàçðàáîò÷èêàõ ReactOS è ëèçåíçèîííîå ñîãëàøåíèå." IDS_OWNERTITLE "Ïåðñîíàëüíûå äàííûå" IDS_OWNERSUBTITLE "Óñòàíîâêà èíôîðìàöèè î ïîëüçîâàòåëÿõ ReactOS." @@ -188,15 +188,15 @@ IDS_CMT_REGEDIT "Çàïóñòèòü ðåäàêòîð ðååñòðà" IDS_CMT_WORDPAD "Çàïóñòèòü ðåäàêòîð äîêóìåíòîâ" IDS_CMT_SCREENSHOT "Ñäåëàòü ñíèìîê ýêðàíà" - IDS_CMT_DEVMGMT "Launch Device Manager" - IDS_CMT_SERVMAN "Launch Service Manager" + IDS_CMT_DEVMGMT "Çàïóñòèòü äèñïåò÷åð óñòðîéñòâ" + IDS_CMT_SERVMAN "Çàïóñòèòü äèñïåò÷åð ñëóæá" END STRINGTABLE BEGIN IDS_GAMES "Èãðû" - IDS_CMT_SOLITAIRE "Solitaire" - IDS_CMT_WINEMINE "WineMine" + IDS_CMT_SOLITAIRE "Ïàñüÿíñ" + IDS_CMT_WINEMINE "Ñàïåð" END STRINGTABLE @@ -241,7 +241,7 @@ STRINGTABLE BEGIN - IDS_STATUS_INSTALL_DEV "Installing devices..." + IDS_STATUS_INSTALL_DEV "Óñòàíîâêà îáîðóäîâàíèÿ..." END /* EOF */

1 0

[fireball] 27650: Patch by Dmitry Chapyshev <lentind@yandex.ru>: - Fix russian translation of calc, charmap, msconfig, mscutils and taskmgr. - Fix mistakes in russian translation of explorer. - Move title of servman to translation resources and translate to russian language.
by fireball＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: fireball Date: Sat Jul 14 16:11:50 2007 New Revision: 27650 URL: http://svn.reactos.org/svn/reactos?rev=27650&view=rev Log: Patch by Dmitry Chapyshev <lentind(a)yandex.ru>: - Fix russian translation of calc, charmap, msconfig, mscutils and taskmgr. - Fix mistakes in russian translation of explorer. - Move title of servman to translation resources and translate to russian language. Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/charmap/lang/ru-RU.rc trunk/reactos/base/applications/msconfig/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc trunk/reactos/base/applications/mscutils/servman/rsrc.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/shell/explorer/explorer-ru.rc Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc Sat Jul 14 16:11:50 2007 @@ -22,10 +22,10 @@ IDS_BTN_DEGREES, "Ãðàäóñû" IDS_BTN_RADIANS, "Ðàäèàíû" IDS_BTN_GRADS, "Ãðàäû" - IDS_BTN_SHRT_HEX "Øåñòí." - IDS_BTN_SHRT_DEC "Äåñÿò." - IDS_BTN_SHRT_OCT "Âîñüì." - IDS_BTN_SHRT_BIN "Äâîè÷." + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" IDS_ERR_INVALID_INPUT, "Íåïðàâèëüíûé àðãóìåíò ôóíêöèè." IDS_ERR_DIVIDE_BY_ZERO, "Äåëèòü íà íóëü íåëüçÿ." IDS_ERR_UNDEFINED, "Ðåçóëüòàò íå îïðåäåë¸í." Modified: trunk/reactos/base/applications/charmap/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/charmap/lang/ru-RU.rc Sat Jul 14 16:11:50 2007 @@ -7,12 +7,12 @@ FONT 8,"MS Sans Serif",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN - LTEXT "Øðèôò :", IDC_STATIC, 6, 7, 24, 9 + LTEXT "Øðèôò:", IDC_STATIC, 6, 7, 27, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS PUSHBUTTON "Ñïðàâêà", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 - LTEXT "Êîïèðîâàòü ñèìâîë :", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Êîïèðîâàòü ñèìâîë:", IDC_STATIC, 6, 188, 95, 9 + EDITTEXT IDC_TEXTBOX, 75, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "Âûáðàòü", IDC_SELECT, 194, 186, 46, 13 PUSHBUTTON "Êîïèðîâàòü", IDC_COPY, 244, 186, 46, 13, WS_DISABLED //AUTOCHECKBOX "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/msconfig/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/ru-RU.rc Sat Jul 14 16:11:50 2007 @@ -30,18 +30,18 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", 237, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148 - PUSHBUTTON "Move &Up", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 - PUSHBUTTON "Move &Down", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 + PUSHBUTTON "Ââ&åðõ", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 + PUSHBUTTON "Â&íèç", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 - PUSHBUTTON "&Enable", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 - PUSHBUTTON "D&isable", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 + PUSHBUTTON "Â&êëþ÷èòü", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 + PUSHBUTTON "&Îòêëþ÷èòü", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 - PUSHBUTTON "&Find", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 - PUSHBUTTON "&New", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 - PUSHBUTTON "Edi&t", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 + PUSHBUTTON "&Ïîèñê", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 + PUSHBUTTON "&Ñîçäàòü", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 + PUSHBUTTON "&Èçìåíèòü", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 - PUSHBUTTON "Ena&ble All", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 - PUSHBUTTON "Disable A&ll",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 + PUSHBUTTON "Âê&ëþ÷èòü âñå", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 + PUSHBUTTON "Î&òêëþ÷èòü âñå",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 END IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 @@ -67,12 +67,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Âàðèàíòû çàïóñêà", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT - CONTROL "&Îáû÷íûé çàïóñê - çàãðóçêà âñåõ äðàéâåðîâ óñòðîéñòâ è çàïóñê âñåõ ñëóæá", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 - CONTROL "&Äèàãíîñòè÷åñêèé çàïóñê - çàãðóçêà òîëüêî îñíîâíûõ äðàéâåðîâ è çàïóñê îñíîâíûõ ñëóæá", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 - CONTROL "&Âûáîðî÷íûé çàïóñê", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 - CHECKBOX "Î&áðàáàòûâàòü ôàéë SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - CHECKBOX "&Çàãðóæàòü ñèñòåìíûå ñëóæáû", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - CHECKBOX "Ç&àãðóæàòü ýëåìåíòû àâòîçàãðóçêè", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 + CONTROL "&Îáû÷íûé çàïóñê - çàãðóçêà âñåõ äðàéâåðîâ óñòðîéñòâ è çàïóñê âñåõ ñëóæá", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 270, 10 + CONTROL "&Äèàãíîñòè÷åñêèé çàïóñê - çàãðóçêà òîëüêî îñíîâíûõ äðàéâåðîâ è çàïóñê îñíîâíûõ ñëóæá", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 310, 10 + CONTROL "&Âûáîðî÷íûé çàïóñê", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 100, 10 + CHECKBOX "Î&áðàáàòûâàòü ôàéë SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 130, 10 + CHECKBOX "&Çàãðóæàòü ñèñòåìíûå ñëóæáû", IDC_CBX_SYSTEM_SERVICE, 30, 95, 130, 10 + CHECKBOX "Ç&àãðóæàòü ýëåìåíòû àâòîçàãðóçêè", IDC_CBX_STARTUP_ITEM, 30, 110, 140, 10 END IDD_FREELDR_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 @@ -80,10 +80,10 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200 - PUSHBUTTON "&Ïðîâåðèòü âñå ïóòè çàãðóçêè", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 - PUSHBUTTON "Ï&î óìîë÷àíèþ", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 - PUSHBUTTON "&Ââåðõ", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 - PUSHBUTTON "Â&íèç", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 + PUSHBUTTON "&Ïðîâåðèòü âñå ïóòè çàãðóçêè", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 110, 12 + PUSHBUTTON "Ï&î óìîë÷àíèþ", IDC_BTN_SET_DEFAULT_BOOT, 125, 65, 70, 12 + PUSHBUTTON "&Ââåðõ", IDC_BTN_MOVE_UP_BOOT_OPTION, 200, 65, 70, 12 + PUSHBUTTON "Â&íèç", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 275, 65, 70, 12 GROUPBOX "Ïàðàìåòðû çàãðóçêè", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 @@ -91,9 +91,9 @@ CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "&Äîïîëíèòåëüíî...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "&Òàéìàóò:", -1, 280, 91, 30, 10 - EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "ñåê.", -1, 340, 91, 15, 10 + LTEXT "&Òàéìàóò:", -1, 280, 82, 30, 10 + EDITTEXT IDC_TXT_BOOT_TIMEOUT, 280, 93, 25, 12, ES_LEFT + LTEXT "ñåê.", -1, 310, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE 0, 0, 175, 175 @@ -145,11 +145,11 @@ IDS_TOOLS_COLUMN_NAME "Íàçâàíèå" IDS_TOOLS_COLUMN_DESCR "Îïèñàíèå" - IDS_TOOLS_CMD_NAME "Êîìíäíàÿ ñòðîêà" + IDS_TOOLS_CMD_NAME "Êîìàíäíàÿ ñòðîêà" IDS_TOOLS_CMD_DESCR "" IDS_TOOLS_CMD_CMD "cmd.exe" - IDS_TOOLS_INFO_NAME "Âåðñèÿ" + IDS_TOOLS_INFO_NAME "Version" IDS_TOOLS_INFO_DESCR "Ïîêàçàòü èíôîðìàöèþ î âåðñèè." IDS_TOOLS_INFO_CMD "winver.exe" Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc Sat Jul 14 16:11:50 2007 @@ -285,3 +285,10 @@ IDS_HINT_SYS_MAXIMIZE " Ðàçãðúùà ïðîçîðåöà, äîêàòî çàïúëíè öåëèÿ åêðàí." IDS_HINT_SYS_CLOSE " Çàòâàðÿ ïðîçîðåöà." END + +/* Application title */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS Service Manager" +END + Modified: trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc Sat Jul 14 16:11:50 2007 @@ -280,3 +280,9 @@ IDS_HINT_SYS_MAXIMIZE " Maximiert dieses Fenster auf Bildschirmgröße." IDS_HINT_SYS_CLOSE " Schließt dieses Fenster." END + +/* Application title */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS Service Manager" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc Sat Jul 14 16:11:50 2007 @@ -280,3 +280,9 @@ IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." IDS_HINT_SYS_CLOSE " Closes this window." END + +/* Application title */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS Service Manager" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc Sat Jul 14 16:11:50 2007 @@ -280,3 +280,9 @@ IDS_HINT_SYS_MAXIMIZE " Melebarkan jendela ini memenuhi layar ini." IDS_HINT_SYS_CLOSE " Menutup jendela ini." END + +/* Application title */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS Service Manager" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc Sat Jul 14 16:11:50 2007 @@ -280,3 +280,9 @@ IDS_HINT_SYS_MAXIMIZE " Espande la finestra fino a riempire lo schermo." IDS_HINT_SYS_CLOSE " Chiude questa finestra." END + +/* Application title */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS Service Manager" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc Sat Jul 14 16:11:50 2007 @@ -287,3 +287,9 @@ IDS_HINT_SYS_MAXIMIZE " Rozwiñ to okno na pe³en ekran." IDS_HINT_SYS_CLOSE " Zamknij to okno." END + +/* Application title */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS Service Manager" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc Sat Jul 14 16:11:50 2007 @@ -78,25 +78,25 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN - LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY - EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY - EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY - COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST + LTEXT "", IDC_SERV_NAME, 78,11,176,11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_DISP_NAME, 78, 29, 166, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + EDITTEXT IDC_DESCRIPTION, 78, 46, 167, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EXEPATH, 6, 86, 240, 11, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + COMBOBOX IDC_START_TYPE, 78, 107, 168, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST PUSHBUTTON "Ïóñê", IDC_START, 6, 155, 54, 15, WS_DISABLED PUSHBUTTON "Ñòîï", IDC_STOP, 68, 155, 54, 15, WS_DISABLED PUSHBUTTON "Ïàóçà", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED PUSHBUTTON "Ïðîäîëæèòü", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED - LTEXT "Èìÿ ñëóæáû:", IDC_STATIC, 4, 11, 53, 11 - LTEXT "Âûâîäèìîå èìÿ:", IDC_STATIC, 4, 29, 53, 11 - LTEXT "Îïèñàíèå:", IDC_STATIC, 4, 51, 53, 11 - LTEXT "Èñïîëíÿåìûé ôàéë:", IDC_STATIC, 6, 73, 82, 9 + LTEXT "Èìÿ ñëóæáû:", IDC_STATIC, 6, 11, 53, 11 + LTEXT "Âûâîäèìîå èìÿ:", IDC_STATIC, 6, 29, 63, 11 + LTEXT "Îïèñàíèå:", IDC_STATIC, 6, 47, 53, 11 + LTEXT "Èñïîëíÿåìûé ôàéë:", IDC_STATIC, 6, 75, 82, 9 LTEXT "Òèï çàïóñêà:", IDC_STATIC, 6, 108, 53, 11 - LTEXT "Ñîñòîÿíèå ñëóæáû:", IDC_STATIC, 4, 138, 53, 11 - LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE + LTEXT "Ñîñòîÿíèå:", IDC_STATIC, 6, 138, 53, 11 + LTEXT "", IDC_SERV_STATUS, 78, 138, 176, 11, WS_CHILD | WS_VISIBLE LTEXT "Ìîæíî óêàçàòü ïàðàìåòðû çàïóñêà, ïðèìåíÿåìûå ïðè çàïóñêå ñëóæáû èç ýòîãî êàòàëîãà.",IDC_STATIC, 6,177,240,15 - LTEXT "Ïàðàìåòðû çàïóñêà:", IDC_STATIC, 6, 200, 58, 11 - EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Ïàðàìåòðû çàïóñêà:", IDC_STATIC, 6, 200, 73, 11 + EDITTEXT IDC_START_PARAM, 78, 199, 168, 11, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_DLG_DEPEND DIALOGEX 6,6,253,225 @@ -107,7 +107,7 @@ CONTROL "",IDC_DEPEND_TREE1,"SysTreeView32",0x50010007,8,70,236,68,0x00000200 CONTROL "",IDC_DEPEND_TREE2,"SysTreeView32",0x50010007,8,151,234,67,0x00000200 LTEXT "Íåêîòîðûå ñëóæáû çàâèñÿò îò äðóãèõ. Åñëè ñëóæáà îñòàíîâëåíà èëè íåïðàâèëüíî ðàáîòàåò, ýòî îòðàæàåòñÿ íà çàâèñèìûõ îò íåå ñëóæáàõ.", IDC_STATIC,8, 7, 238, 26 - LTEXT "Ýòà ñëóæáà çàâèñèò îò ñëåäóþùèõ êîìïîíåíòîâ", IDC_STATIC, 8, 57, 236, 9 + LTEXT "Ýòà ñëóæáà çàâèñèò îò ñëåäóþùèõ êîìïîíåíòîâ:", IDC_STATIC, 8, 59, 236, 9 LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13 END @@ -179,7 +179,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_SERVICES_STARTED "Çàïóùåíî" + IDS_SERVICES_STARTED "Ðàáîòàåò" IDS_SERVICES_STOPPED "Îñòàíîâëåíî" IDS_SERVICES_AUTO "Àâòî" IDS_SERVICES_MAN "Âðó÷íóþ" @@ -281,3 +281,9 @@ IDS_HINT_SYS_MAXIMIZE " Ðàçâåðíóòü ýòî îêíî íà ïîëíûé ýêðàí." IDS_HINT_SYS_CLOSE " Çàêðûòü ýòî îêíî." END + +/* Application title */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "Ìåíåäæåð ñëóæá ReactOS" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc Sat Jul 14 16:11:50 2007 @@ -289,3 +289,9 @@ IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." IDS_HINT_SYS_CLOSE " Closes this window." END + +/* Application title */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS Service Manager" +END Modified: trunk/reactos/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/rsrc.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/rsrc.rc Sat Jul 14 16:11:50 2007 @@ -4,11 +4,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 24 DISCARDABLE "manifest.xml" - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPNAME "ReactOS Service Manager" -END IDI_SM_ICON ICON "res/system.ico" Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc Sat Jul 14 16:11:50 2007 @@ -191,9 +191,9 @@ BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 - PUSHBUTTON "&Íîâàÿ çàäà÷à...",IDC_NEWTASK,187,189,53,14 - PUSHBUTTON "&Ïåðåêëþ÷èòüñÿ",IDC_SWITCHTO,131,189,53,14,WS_DISABLED - PUSHBUTTON "&Çàâåðøèòü çàäà÷ó",IDC_ENDTASK,75,189,53,14,WS_DISABLED + PUSHBUTTON "&Íîâàÿ çàäà÷à...",IDC_NEWTASK,167,189,73,14 + PUSHBUTTON "&Ïåðåêëþ÷èòüñÿ",IDC_SWITCHTO,89,189,73,14,WS_DISABLED + PUSHBUTTON "&Çàâåðøèòü çàäà÷ó",IDC_ENDTASK,12,189,73,14,WS_DISABLED END IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 @@ -203,9 +203,9 @@ CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,7,7,233,177 - PUSHBUTTON "&Çàâåðøèòü ïðîöåññ",IDC_ENDPROCESS,171,189,69,14 + PUSHBUTTON "&Çàâåðøèòü ïðîöåññ",IDC_ENDPROCESS,167,189,74,14 CONTROL "&Îòîáðàæàòü ïðîöåññû âñåõ ïîëüçîâàòåëåé",IDC_SHOWALLPROCESSES, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,153,10 END //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 @@ -214,13 +214,13 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Çàãðóçêà ÖÏ",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT - GROUPBOX "Çàãðóçêà ïàìÿòè",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Ôàéë ïîäêà÷êè",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Âñåãî",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Âûäåëåíèå ïàìÿòè (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Ôèçè÷åñêàÿ ïàìÿòü (K)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Ïàìÿòü ÿäðà (K)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT - LTEXT "Äèñêðèïòîðîâ",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 - LTEXT "Ïîòîêîâ",IDS_TOTALS_THREAD_COUNT,12,140,27,8 + LTEXT "Äèñêðèïòîðîâ",IDS_TOTALS_HANDLE_COUNT,12,131,57,8 + LTEXT "Ïîòîêîâ",IDS_TOTALS_THREAD_COUNT,12,140,30,8 LTEXT "Ïðîöåññîâ",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER @@ -229,7 +229,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Âñåãî",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Ïðåäåë",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Ïðåäåë",IDS_COMMIT_CHARGE_LIMIT,12,184,27,8 LTEXT "Ïèê",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER @@ -238,18 +238,18 @@ EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Âñåãî",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 - LTEXT "Äîñòóïíî",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 - LTEXT "Ñèñòåìíûé êåø",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | + LTEXT "Äîñòóïíî",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,33,8 + LTEXT "Ñèñòåìíûé êåø",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,62,8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,192,131,41,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Âñåãî",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 - LTEXT "Âûãðóæàåìàÿ",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 - LTEXT "Íåâûãðóæàåìàÿ",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | + LTEXT "Âûãðóæàåìàÿ",IDS_KERNEL_MEMORY_PAGED,137,184,50,8 + LTEXT "Íåâûãðóæàåìàÿ",IDS_KERNEL_MEMORY_NONPAGED,137,193,62,8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL,192,174,41,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER @@ -283,8 +283,8 @@ CAPTION "Ñåìåéñòâî ïðîöåññîðîâ" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK",IDOK,120,133,50,14 - PUSHBUTTON "Îòìåíà",IDCANCEL,174,133,50,14 + DEFPUSHBUTTON "OK",IDOK,124,133,50,14 + PUSHBUTTON "Îòìåíà",IDCANCEL,178,133,50,14 LTEXT "Óñòàíîâêà ïðîöåññîðîâ, íà êîòîðûõ áóäåò âûïîëíÿòüñÿ çàäà÷à.", IDC_STATIC,5,5,220,16 CONTROL "ÖÏ 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, @@ -353,65 +353,65 @@ WS_DISABLED | WS_TABSTOP,175,119,41,10 END -IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 +IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 230, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Âûáîð ñòîëáöîâ" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK",IDOK,84,178,50,14 - PUSHBUTTON "Îòìåíà",IDCANCEL,138,178,50,14 - LTEXT "Âûáîð ñòîëáöîâ, îòîáðàæàåìûõ â ñïèñêå Ìåíåäæåðà çàäà÷.", - IDC_STATIC,7,7,181,17 + DEFPUSHBUTTON "OK",IDOK,113,178,50,14 + PUSHBUTTON "Îòìåíà",IDCANCEL,167,178,50,14 + LTEXT "Âûáîð ñòîëáöîâ, îòîáðàæàåìûõ â ñïèñêå äèñïåò÷åðà çàäà÷.", + IDC_STATIC,7,7,220,17 CONTROL "&Èìÿ îáðàçà",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,28,56,10 CONTROL "PID (èäåíòè&ô. ïðîöåññà)",IDC_PID,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,39,92,10 CONTROL "&Çàãðóçêà ÖÏ",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,53,10 CONTROL "&Âðåìÿ ÖÏ",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,48,10 CONTROL "&Ïàìÿòü - èñïîëüçîâàíèå",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,72,63,10 + WS_TABSTOP,7,72,93,10 CONTROL "Ïàìÿòü - èçìå&íåíèå",IDC_MEMORYUSAGEDELTA,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 CONTROL "Ïàìÿòü - &ìàêñèìóì",IDC_PEAKMEMORYUSAGE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 CONTROL "&Îøèáîê ñòðàíèöû",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,105,53,10 + WS_TABSTOP,7,105,90,10 CONTROL "Îá&úåêòû USER",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,116,62,10 CONTROL "×èñëî ÷òåíèé",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,127,49,10 + WS_TABSTOP,7,127,60,10 CONTROL "Ïðî÷èòàíî áàéò",IDC_IOREADBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 CONTROL "Êîä ñå&àíñà",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,149,50,10 CONTROL "Èì&ÿ ïîëüçîâàòåëÿ",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,160,51,10 + WS_TABSTOP,7,160,80,10 CONTROL "Îøèáîê &ñòðàíèöû - èçìåíåíèå",IDC_PAGEFAULTSDELTA,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 - CONTROL "Îáúåì âèðòóàë&üíîé ïàìÿòè",IDC_VIRTUALMEMORYSIZE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 + BS_AUTOCHECKBOX | WS_TABSTOP,107,28,114,10 + CONTROL "Îáúåì âèðò&óàëüíîé ïàìÿòè",IDC_VIRTUALMEMORYSIZE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,39,110,10 CONTROL "Âû&ãðóæàåìûé ïóë",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,50,53,10 + WS_TABSTOP,107,50,90,10 CONTROL "Íåâûãð&óæàåìûé ïóë",IDC_NONPAGEDPOOL,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 + BS_AUTOCHECKBOX | WS_TABSTOP,107,61,90,10 CONTROL "&Áàçîâûé ïðèîðèòåò",IDC_BASEPRIORITY,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 + BS_AUTOCHECKBOX | WS_TABSTOP,107,72,90,10 CONTROL "Ñ÷åò÷èê &äèñêðèïòîðîâ",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,83,59,10 + WS_TABSTOP,107,83,90,10 CONTROL "Ñ&÷åò÷èê ïîòîêîâ",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,94,59,10 + WS_TABSTOP,107,94,67,10 CONTROL "Îáú&åêòû GDI",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,105,55,10 CONTROL "×èñëî çàïèñåé",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,116,49,10 + WS_TABSTOP,107,116,65,10 CONTROL "Çàïèñàíî áàéò",IDC_IOWRITEBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 CONTROL "Ïðî÷èé ââîä-âûâîä",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,138,46,10 + WS_TABSTOP,107,138,90,10 CONTROL "Ïðî÷èõ áàéò ïðè ââîäå-âûâîäå",IDC_IOOTHERBYTES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,149,65,10 + BS_AUTOCHECKBOX | WS_TABSTOP,107,149,115,10 END Modified: trunk/reactos/base/shell/explorer/explorer-ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ru.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-ru.rc Sat Jul 14 16:11:50 2007 @@ -30,7 +30,7 @@ BEGIN POPUP "&Ôàéë" BEGIN - MENUITEM "&Çàïóñòèòü...", ID_EXECUTE + MENUITEM "&Âûïîëíèòü...", ID_EXECUTE MENUITEM SEPARATOR MENUITEM "Â&ûõîä", ID_FILE_EXIT END @@ -57,13 +57,13 @@ END POPUP "&Èíñòðóìåíòû" BEGIN - MENUITEM "&Îïöèè", ID_TOOLS_OPTIONS + MENUITEM "&Íàñòðîéêà", ID_TOOLS_OPTIONS END POPUP "Ïî&ìîùü" BEGIN - MENUITEM "&FAQ(×àÂî) ïî Ïðîâîäíèêó...", ID_EXPLORER_FAQ - MENUITEM "Î &Ïðîâîäíèêå...", ID_ABOUT_EXPLORER - MENUITEM "Îá &ÎÑ...", ID_ABOUT_WINDOWS + MENUITEM "&×àñòûå âîïðîñû ïî Ïðîâîäíèêó...", ID_EXPLORER_FAQ + MENUITEM "Î &Ïðîâîäíèêå", ID_ABOUT_EXPLORER + MENUITEM "Î &ReactOS", ID_ABOUT_WINDOWS END END @@ -71,10 +71,10 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Íàñòðîéêè...", ID_DESKTOPBAR_SETTINGS - MENUITEM "&Äèñïåò÷åð Çàäà÷...", ID_TASKMGR - MENUITEM SEPARATOR - MENUITEM "&Î Ïðîâîäíèêå...", ID_ABOUT_EXPLORER + MENUITEM "&Íàñòðîéêè...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Äèñïåò÷åð çàäà÷", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&Î Ïðîâîäíèêå", ID_ABOUT_EXPLORER END END @@ -96,7 +96,7 @@ MENUITEM "&Íàñòðîéêà óâåäîìëåíèé...", ID_CONFIG_NOTIFYAREA MENUITEM "Íàñòðîéêà äàòû/&âðåìåíè", ID_CONFIG_TIME MENUITEM SEPARATOR - MENUITEM "&Î Ïðîâîäíèêå...", ID_ABOUT_EXPLORER + MENUITEM "&Î Ïðîâîäíèêå", ID_ABOUT_EXPLORER END END @@ -124,9 +124,9 @@ END POPUP "&Ñïðàâêà" BEGIN - MENUITEM "&FAQ(×àÂÎ) ïî Ïðîâîäíèêó...", ID_EXPLORER_FAQ - MENUITEM "Î &Ïðîâîäíèêå...", ID_ABOUT_EXPLORER - MENUITEM "Îá &ÎÑ...", ID_ABOUT_WINDOWS + MENUITEM "&×àñòûå âîïðîñû ïî Ïðîâîäíèêó...", ID_EXPLORER_FAQ + MENUITEM "Î &Ïðîâîäíèêå", ID_ABOUT_EXPLORER + MENUITEM "Î &ReactOS", ID_ABOUT_WINDOWS END END @@ -145,7 +145,7 @@ CONTROL "&Êîìàíäà:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, 18,60,10 EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "As &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + CONTROL "Êàê &ññûëêó",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, 45,71,12 DEFPUSHBUTTON "&OK",1,158,6,47,14 PUSHBUTTON "&Îòìåíà",2,158,24,47,14 @@ -156,7 +156,7 @@ STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW -CAPTION "Ïîèñê ïðîãðàììû â Ïñóêå" +CAPTION "Ïîèñê ïðîãðàìì â ìåíþ Ïócê" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "&Ôèëüòð:",IDC_STATIC,7,9,30,8 @@ -169,7 +169,7 @@ IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Ñâîéñòâà Ðàáî÷åãî Ñòîëà" +CAPTION "Ñâîéñòâà Ðàáî÷åãî ñòîëà" FONT 8, "MS Sans Serif" BEGIN LTEXT "Âûáåðèòå, íàèáîëåå ïðåäïî÷òèòåëüíûé äëÿ âàñ, \nñïîñîá âûðàâíèâàíèÿ çíà÷êîâ", @@ -198,7 +198,7 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Ïîêàçûâàòü Íîìåð &Âåðñèè",ID_DESKTOP_VERSION,"Button", + CONTROL "Ïîêàçûâàòü íîìåð &âåðñèè",ID_DESKTOP_VERSION,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,177,109,10 END @@ -208,16 +208,16 @@ FONT 8, "MS Sans Serif" BEGIN CONTROL "Îòîáðàæàòü &÷àñû",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,152,52,10 + WS_TABSTOP,7,142,100,10 CONTROL "&Ñêðûâàòü íåèñïîëüçóåìûå çíà÷êè", ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,174,111,10 - PUSHBUTTON "&Óâåäîìëåíèÿ...",ID_CONFIG_NOTIFYAREA,153,173,50,14 + WS_TABSTOP,7,157,125,10 + PUSHBUTTON "&Óâåäîìëåíèÿ...",ID_CONFIG_NOTIFYAREA,133,173,70,14 END IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Ñâîéòñâà ìåíþ Ïóñê" +CAPTION "Ñâîéñòâà ìåíþ Ïóñê" FONT 8, "MS Sans Serif" BEGIN END @@ -231,24 +231,24 @@ BEGIN CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 - LTEXT "&Òåêñò Ïîäñêàçêè:",IDC_LABEL1,7,44,62,8 + LTEXT "&Òåêñò ïîäñêàçêè:",IDC_LABEL1,7,44,62,8 EDITTEXT IDC_NOTIFY_TOOLTIP,76,42,125,14,ES_AUTOHSCROLL - LTEXT "Çàãîëîâîê Î&êíà:",IDC_LABEL2,7,63,58,8 + LTEXT "Çàãîëîâîê î&êíà:",IDC_LABEL2,7,63,58,8 EDITTEXT IDC_NOTIFY_TITLE,76,60,125,14,ES_AUTOHSCROLL - LTEXT "&Ïóòü ê Ìîäóëþ:",IDC_LABEL3,7,81,54,8 + LTEXT "&Ïóòü ê ìîäóëþ:",IDC_LABEL3,7,81,54,8 EDITTEXT IDC_NOTIFY_MODULE,76,78,125,14,ES_AUTOHSCROLL - GROUPBOX "&Ðåæèì Îòîáðàæåíèÿ",IDC_LABEL4,7,96,169,28 + GROUPBOX "&Ðåæèì îòîáðàæåíèÿ",IDC_LABEL4,7,96,169,28 CONTROL "&ïîêàçàòü",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,15,108,47,10 - CONTROL "&ñêðûòü",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, + CONTROL "&Ñêðûòü",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, 108,41,10 - CONTROL "à&âòîñêðûòèå",IDC_NOTIFY_AUTOHIDE,"Button", + CONTROL "À&âòîñêðûòèå",IDC_NOTIFY_AUTOHIDE,"Button", BS_AUTORADIOBUTTON,112,108,60,10 ICON "",IDC_PICTURE,181,101,20,20 - LTEXT "&Ïîñëåäíèå\nÈçìåíåíèÿ",IDC_LABEL6,7,129,40,19 + LTEXT "&Ïîñëåäíèå\nèçìåíåíèÿ",IDC_LABEL6,7,129,40,19 EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | ES_READONLY - CONTROL "ïîêà&çàòü ñêðûòîå",ID_SHOW_HIDDEN_ICONS,"Button", + CONTROL "Ïîêà&çàòü ñêðûòîå",ID_SHOW_HIDDEN_ICONS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,154,78,10 DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP PUSHBUTTON "&Îòìåíà",IDCANCEL,151,153,50,14 @@ -262,19 +262,19 @@ BEGIN LTEXT "Âûáåðèòå íàèáîëåå ïðåäïî÷òèòåëüíûé äëÿ âàñ\nâèä ïðîâîäíèêà:", IDC_STATIC,7,7,171,17 - CONTROL "&MDI (ìíîãîäîêóìåíòíûé íòåðôåéñ)",IDC_MDI,"Button", + CONTROL "&MDI (ìíîãîäîêóìåíòíûé èíòåðôåéñ)",IDC_MDI,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,136,10 CONTROL "&SDI (îäíîäîêóìåíòíûé èíòåðôåéñ)",IDC_SDI,"Button", BS_AUTORADIOBUTTON,7,62,134,10 CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 - CONTROL "Open Subfolders in s&eparate windows", + CONTROL "Îòêðûâàòü ïîäïàïêè â î&òäåëüíûõ îêíàõ", IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,90,135,10 + WS_TABSTOP,7,90,147,10 LTEXT "Ýòè íàñòðîéêè áóäóò èñïîëüçîâàííû, êàê çíà÷åíèå ïî óìîë÷àíèþ äëÿ âñåõ îêîí ïðîâîäíèêà â áóäóùåì.", IDC_STATIC,7,107,174,26 DEFPUSHBUTTON "&OK",IDOK,29,136,50,14,WS_GROUP - PUSHBUTTON "&Cancel",IDCANCEL,106,136,50,14 + PUSHBUTTON "&Îòìåíà",IDCANCEL,106,136,50,14 END IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 @@ -329,14 +329,14 @@ IDS_TITLE "Ïðîâîäíèê ReactOS" IDS_START "Ïóñê" IDS_LOGOFF "Âûõîä èç ñèñòåìû..." - IDS_SHUTDOWN "Âûêëþ÷èòü..." + IDS_SHUTDOWN "Âûêëþ÷åíèå..." IDS_LAUNCH "Âûïîëíèòü..." IDS_START_HELP "Ñïðàâêà" IDS_SEARCH_FILES "Ïîèñê..." IDS_DOCUMENTS "Äîêóìåíòû" IDS_FAVORITES "Èçáðàííîå" IDS_PROGRAMS "Ïðîãðàììû" - IDS_SETTINGS "Íàñòðîéêè" + IDS_SETTINGS "Íàñòðîéêà" IDS_EXPLORE "Îáçîð" IDS_EMPTY "(Ïóñòî)" IDS_RECENT "Íåäàâíèå äîêóìåíòû" @@ -345,17 +345,17 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_STARTMENU "Ìåíþ Ïóñêà" - IDS_MINIMIZE_ALL "ñâåðíóòü âñå îêíà" - IDS_DESKTOP_NUM "Ðàáî÷èé Ñòîë %d" + IDS_STARTMENU "Ìåíþ Ïóñê" + IDS_MINIMIZE_ALL "Câåðíóòü âñå îêíà" + IDS_DESKTOP_NUM "Ðàáî÷èé còîë %d" IDS_VOLUME "Îáú¸ì" - IDS_ITEMS_CUR "òåêóùåé ýëåìåíò" - IDS_ITEMS_CONFIGURED "êîíôèãóðàöèÿ" - IDS_ITEMS_VISIBLE "âèäèìûé" - IDS_ITEMS_HIDDEN "ñêðûòûé" - IDS_NOTIFY_SHOW "ïîêàçàòü" - IDS_NOTIFY_HIDE "ñêðûòü" - IDS_NOTIFY_AUTOHIDE "àâòîñêðûòèå" + IDS_ITEMS_CUR "Òåêóùåé ýëåìåíò" + IDS_ITEMS_CONFIGURED "Êîíôèãóðàöèÿ" + IDS_ITEMS_VISIBLE "Âèäèìûé" + IDS_ITEMS_HIDDEN "Ñêðûòûé" + IDS_NOTIFY_SHOW "Ïîêàçàòü" + IDS_NOTIFY_HIDE "Ñêðûòü" + IDS_NOTIFY_AUTOHIDE "Àâòîñêðûòèå" IDS_SHOW_HIDDEN_ICONS "Ïîêàçàòü ñêðûòûå çíà÷êè" IDS_HIDE_ICONS "Ñêðûòü çíà÷êè" IDS_TERMINATE "Çàâåðøèòü ðàáîòó Ïðîâîäíèêà" @@ -367,18 +367,18 @@ IDS_CONNECTIONS "Ñåòåâûå ïîäêëþ÷åíèÿ" IDS_DRIVES "Äèñêè" IDS_SEARCH_COMPUTER "Íàéòè êîìïüþòåð..." - IDS_SETTINGS_MENU "Íàñòðîéêà ìåíþ" + IDS_SETTINGS_MENU "Ìåíþ íàñòðîéêè" IDS_CONTROL_PANEL "Ïàíåëü óïðàâëåíèÿ" IDS_PRINTERS "Ïðèíòåðû" IDS_BROWSE "Îáçîð ôàéëîâ" IDS_SEARCH_PRG "Íàéòè ïðîãðàììó..." IDS_ALL_USERS "Âñå ïîëüçîâàòåëè\\" IDS_SEARCH "Ïîèñê" - IDS_ABOUT_EXPLORER "&Î Ïðîâîäíèêå..." + IDS_ABOUT_EXPLORER "&Î Ïðîâîäíèêå" IDS_LAUNCH_MANY_PROGRAMS "Âû âûáðàëè áîëåå îäíîé ïðîãðàììû.\nÂû óâåðåíû, ÷òî õîòèòå âûïîëíèòü èõ âñå?" IDS_DESKTOPBAR_SETTINGS "Íàñòðîéêè ðàáî÷åãî ñòîëà" - IDS_DESKTOP "Ðàáî÷èé Ñòîë" + IDS_DESKTOP "Ðàáî÷èé ñòîë" IDS_TASKBAR "Ïàíåëü çàäà÷" END

1 0

[weiden] 27649: Patch by David Lenon <DavidL@126.com>: - Fix overflow check in RtlUpcaseUnicodeStringToCountedOemString See issue #2403 for more details.
by weiden＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: weiden Date: Sat Jul 14 14:59:18 2007 New Revision: 27649 URL: http://svn.reactos.org/svn/reactos?rev=27649&view=rev Log: Patch by David Lenon <DavidL(a)126.com>: - Fix overflow check in RtlUpcaseUnicodeStringToCountedOemString See issue #2403 for more details. Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=2764… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c (original) +++ trunk/reactos/lib/rtl/unicode.c Sat Jul 14 14:59:18 2007 @@ -1632,7 +1632,7 @@ OemDest->MaximumLength = Length; if (!OemDest->Buffer) return STATUS_NO_MEMORY; } - else if (OemDest->Length >= OemDest->MaximumLength) + else if (OemDest->Length > OemDest->MaximumLength) { return STATUS_BUFFER_OVERFLOW; }

1 0

[janderwald] 27648: - fix commandline arguments
by janderwald＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: janderwald Date: Sat Jul 14 14:28:58 2007 New Revision: 27648 URL: http://svn.reactos.org/svn/reactos?rev=27648&view=rev Log: - fix commandline arguments Modified: trunk/reactos/tools/sysreg/sysreg.cpp Modified: trunk/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.cpp?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.cpp (original) +++ trunk/reactos/tools/sysreg/sysreg.cpp Sat Jul 14 14:28:58 2007 @@ -34,7 +34,7 @@ TCHAR DefaultConfig[] = _T("sysreg.cfg"); TCHAR *ConfigFile; - if ((argc >= 2)) + if ((argc > 2)) { cerr << USAGE << endl; return -1; @@ -50,7 +50,6 @@ { ConfigFile = DefaultConfig; } - if (!config.parseFile (ConfigFile)) {

1 0

[janderwald] 27647: - fix command line handlung - fix configuration and file parser - remove hack
by janderwald＠svn.reactos.org 14 Jul '07

14 Jul '07

Author: janderwald Date: Sat Jul 14 14:24:02 2007 New Revision: 27647 URL: http://svn.reactos.org/svn/reactos?rev=27647&view=rev Log: - fix command line handlung - fix configuration and file parser - remove hack Modified: trunk/reactos/tools/sysreg/conf_parser.cpp trunk/reactos/tools/sysreg/file_reader.cpp trunk/reactos/tools/sysreg/sysreg.cpp Modified: trunk/reactos/tools/sysreg/conf_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.c… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.cpp (original) +++ trunk/reactos/tools/sysreg/conf_parser.cpp Sat Jul 14 14:24:02 2007 @@ -16,7 +16,6 @@ namespace Sysreg_ { using std::ifstream; - extern "C" FILE * open(char * filename, char* filemode); //--------------------------------------------------------------------------------------- ConfigParser::ConfigParser() { @@ -36,14 +35,13 @@ #ifdef UNICODE file = _tfopen(FileName, _T("rt,ccs=UNICODE")); #else - file = open(FileName, "rt"); + file = fopen(FileName, "rt"); #endif if (!file) { cerr << "Error: ConfigParser::parseFile failed to open configuration file " << FileName << endl; return false; } - bool ret = false; while (!feof(file)) { Modified: trunk/reactos/tools/sysreg/file_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/file_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/file_reader.cpp (original) +++ trunk/reactos/tools/sysreg/file_reader.cpp Sat Jul 14 14:24:02 2007 @@ -12,7 +12,6 @@ #include <cstdio> namespace System_ { - extern "C" FILE * open(char * filename, char* filemode); //--------------------------------------------------------------------------------------- FileReader::FileReader() : DataSource(), m_File(NULL) { @@ -27,7 +26,7 @@ #ifdef UNICODE m_File = (FILE*)_tfopen(filename.c_str(), _T("rb,ccs=UNICODE")); #else - m_File = open((char*)filename.c_str(), (char*)"rb"); + m_File = fopen((char*)filename.c_str(), (char*)"rb"); #endif if (m_File) Modified: trunk/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.cpp?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.cpp (original) +++ trunk/reactos/tools/sysreg/sysreg.cpp Sat Jul 14 14:24:02 2007 @@ -23,7 +23,7 @@ #endif static const TCHAR USAGE[] = -_T("sysreg.exe -l | [conf_file] <testname>\n\n-l - list available tests\nconf_file - (optional) path to a configuration file (default: sysreg.cfg)\ntest_name - name of test to execute\n"); +_T("sysreg.exe [conf_file]\nconfiguration file (default: sysreg.cfg)"); @@ -33,9 +33,8 @@ ConfigParser config; TCHAR DefaultConfig[] = _T("sysreg.cfg"); TCHAR *ConfigFile; - TCHAR * TestName; - if ((argc != 3) && (argc != 2)) + if ((argc >= 2)) { cerr << USAGE << endl; return -1; @@ -45,13 +44,11 @@ if (argc == 2) { - ConfigFile = DefaultConfig; - TestName = argv[1]; + ConfigFile = argv[1]; } else { - ConfigFile = argv[1]; - TestName = argv[2]; + ConfigFile = DefaultConfig; } @@ -64,7 +61,7 @@ RosBootTest * regtest = new RosBootTest(); if (!regtest) { - cerr << "Error: the requested regression test does not exist" << endl; + cerr << "Error: failed to create regression test" << endl; return -1; }

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
71
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 July 2007