Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 31322: support CP_SYMBOL in MultiByteToWideChar and WideCharToMultiByte ported from Wine. patch by Daniel Zimmermann <netzimme at aim dot com> See issue #2870 for more details.
by cwittich＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: cwittich Date: Wed Dec 19 13:56:29 2007 New Revision: 31322 URL: http://svn.reactos.org/svn/reactos?rev=31322&view=rev Log: support CP_SYMBOL in MultiByteToWideChar and WideCharToMultiByte ported from Wine. patch by Daniel Zimmermann <netzimme at aim dot com> See issue #2870 for more details. Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c Wed Dec 19 13:56:29 2007 @@ -495,6 +495,116 @@ return MultiByteCount; } +} + +/** + * @name IntMultiByteToWideCharSYMBOL + * + * Internal version of MultiByteToWideChar for SYMBOL. + * + * @see MultiByteToWideChar + */ + +static INT STDCALL +IntMultiByteToWideCharSYMBOL(DWORD Flags, + LPCSTR MultiByteString, INT MultiByteCount, + LPWSTR WideCharString, INT WideCharCount) +{ + LONG Count; + UCHAR Char; + INT WideCharMaxLen; + + + if (Flags != 0) + { + SetLastError(ERROR_INVALID_FLAGS); + return 0; + } + + if (WideCharCount == 0) + { + return MultiByteCount; + } + + WideCharMaxLen = WideCharCount > MultiByteCount ? MultiByteCount : WideCharCount; + + for (Count = 0; Count < WideCharMaxLen; Count++) + { + Char = MultiByteString[Count]; + if ( Char < 0x20 ) + { + WideCharString[Count] = Char; + } + else + { + WideCharString[Count] = Char + 0xf000; + } + } + if (MultiByteCount > WideCharMaxLen) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + + return WideCharMaxLen; +} + +/** + * @name IntWideCharToMultiByteSYMBOL + * + * Internal version of WideCharToMultiByte for SYMBOL. + * + * @see WideCharToMultiByte + */ + +static INT STDCALL +IntWideCharToMultiByteSYMBOL(DWORD Flags, + LPCWSTR WideCharString, INT WideCharCount, + LPSTR MultiByteString, INT MultiByteCount) +{ + LONG Count; + INT MaxLen; + WCHAR Char; + + if (Flags!=0) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + + if( MultiByteCount == 0) + { + return WideCharCount; + } + + MaxLen = MultiByteCount>WideCharCount?WideCharCount:MultiByteCount; + for (Count = 0;Count<MaxLen;Count++) + { + Char = WideCharString[Count]; + if (Char<0x20) + { + MultiByteString[Count] = Char; + } + else + { + if ((Char>=0xf020)&&(Char<0xf100)) + { + MultiByteString[Count] = Char - 0xf000; + } + else + { + SetLastError(ERROR_NO_UNICODE_TRANSLATION); + return 0; + } + } + } + if ( WideCharCount > MaxLen) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + return MaxLen; } /** @@ -951,9 +1061,9 @@ return 0; case CP_SYMBOL: - DPRINT1("MultiByteToWideChar for CP_SYMBOL is not implemented!\n"); - return 0; - + return IntMultiByteToWideCharSYMBOL( + Flags, MultiByteString, MultiByteCount, + WideCharString, WideCharCount); default: return IntMultiByteToWideCharCP( CodePage, Flags, MultiByteString, MultiByteCount, @@ -1034,8 +1144,14 @@ return 0; case CP_SYMBOL: - DPRINT1("WideCharToMultiByte for CP_SYMBOL is not implemented!\n"); - return 0; + if ((DefaultChar!=NULL) || (UsedDefaultChar!=NULL)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + return IntWideCharToMultiByteSYMBOL( + Flags,WideCharString,WideCharCount,MultiByteString, + MultiByteCount); default: return IntWideCharToMultiByteCP(

1 0

[fireball] 31321: - Fix a problem with parameter passing in DispatchTwoParam (it was always zeroed, which was not correct). Problem found by Dmitry Philippov. - Fix a typo KiTrap14 which prevented correct passing of the error code to the exception dispatcher. (by Dmitry Philippov).
by fireball＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: fireball Date: Wed Dec 19 13:29:08 2007 New Revision: 31321 URL: http://svn.reactos.org/svn/reactos?rev=31321&view=rev Log: - Fix a problem with parameter passing in DispatchTwoParam (it was always zeroed, which was not correct). Problem found by Dmitry Philippov. - Fix a typo KiTrap14 which prevented correct passing of the error code to the exception dispatcher. (by Dmitry Philippov). Modified: trunk/reactos/ntoskrnl/ke/i386/boot.S (props changed) trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S (props changed) trunk/reactos/ntoskrnl/ke/i386/trap.s (contents, props changed) trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S (props changed) trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S (props changed) Propchange: trunk/reactos/ntoskrnl/ke/i386/boot.S ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Wed Dec 19 13:29:08 2007 @@ -657,7 +657,6 @@ .func DispatchTwoParam _DispatchTwoParam: /* Call the common dispatcher */ - xor edx, edx mov ecx, 2 call _CommonDispatchException .endfunc @@ -1230,6 +1229,7 @@ /* Raise exception */ mov eax, STATUS_FLOAT_STACK_CHECK + xor edx, edx jmp _DispatchTwoParam ValidNpxOpcode: @@ -1449,6 +1449,7 @@ mov ebx, [ebp+KTRAP_FRAME_EIP] mov esi, -1 mov eax, STATUS_ACCESS_VIOLATION + xor edx, edx jmp _DispatchTwoParam RaiseIrql: @@ -1593,6 +1594,7 @@ mov esi, [ebp+KTRAP_FRAME_ERROR_CODE] and esi, 0xFFFF mov eax, STATUS_ACCESS_VIOLATION + xor edx, edx jmp _DispatchTwoParam MsrCheck: @@ -1802,6 +1804,7 @@ mov ebx, [ebp+KTRAP_FRAME_EIP] mov esi, -1 mov eax, STATUS_ACCESS_VIOLATION + xor edx, edx jmp _DispatchTwoParam DispatchV86Gpf: @@ -1900,8 +1903,8 @@ /* Check if the fault occured in a V86 mode */ CheckVdmPf: mov ecx, [ebp+KTRAP_FRAME_ERROR_CODE] + shr ecx, 1 and ecx, 1 - shr ecx, 1 test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jnz VdmPF Propchange: trunk/reactos/ntoskrnl/ke/i386/trap.s ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[dreimer] 31320: Updated German RC File of systeminfo.
by dreimer＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: dreimer Date: Wed Dec 19 13:28:55 2007 New Revision: 31320 URL: http://svn.reactos.org/svn/reactos?rev=31320&view=rev Log: Updated German RC File of systeminfo. Modified: trunk/rosapps/sysutils/systeminfo/lang/de-DE.rc Modified: trunk/rosapps/sysutils/systeminfo/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/lang/d… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/lang/de-DE.rc (original) +++ trunk/rosapps/sysutils/systeminfo/lang/de-DE.rc Wed Dec 19 13:28:55 2007 @@ -59,8 +59,8 @@ IDS_PAGEFILE_LOC, "Auslagerungsdateipfad(e) %s" IDS_TIME_ZONE, "Zeitzone: %s\n" IDS_DOMINE, "Domain: %s\n" -IDS_BIOS_DATE, "BIOS Date: %s\n" +IDS_BIOS_DATE, "BIOS Datum: %s\n" IDS_BIOS_VERSION, "BIOS Version: %s\n" -IDS_NETWORK_CARDS, "Network Card(s) %u Installed.\n" +IDS_NETWORK_CARDS, "Netzwerkkarte(n) %u Installiert.\n" END

1 0

[cwittich] 31319: fix a crash in SaveBoard
by cwittich＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: cwittich Date: Wed Dec 19 13:05:36 2007 New Revision: 31319 URL: http://svn.reactos.org/svn/reactos?rev=31319&view=rev Log: fix a crash in SaveBoard Modified: trunk/reactos/base/applications/games/winemine/main.c Modified: trunk/reactos/base/applications/games/winemine/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/main.c (original) +++ trunk/reactos/base/applications/games/winemine/main.c Wed Dec 19 13:05:36 2007 @@ -404,7 +404,7 @@ for( i = 0; i < 3; i++ ) { wsprintf( key_name, "Time%u", i ); - RegSetValueEx( hkey, key_name, 0, REG_DWORD, (LPBYTE) p_board->best_time[i], sizeof(DWORD) ); + RegSetValueEx( hkey, key_name, 0, REG_DWORD, (LPBYTE) &p_board->best_time[i], sizeof(DWORD) ); } RegCloseKey( hkey );

1 0

[cwittich] 31318: %wZ req. PUNICODE_STRING instead of UNICODE_STRING
by cwittich＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: cwittich Date: Wed Dec 19 12:52:12 2007 New Revision: 31318 URL: http://svn.reactos.org/svn/reactos?rev=31318&view=rev Log: %wZ req. PUNICODE_STRING instead of UNICODE_STRING Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Wed Dec 19 12:52:12 2007 @@ -967,7 +967,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Can't locate driver object for %wZ\n", ObjectName); + DPRINT1("Can't locate driver object for %wZ\n", &ObjectName); return Status; }

1 0

[dchapyshev] 31317: - Add myself to CREDITS (no comments ; )) - Add rasapi32, rasdlg and rasman to apistatus.lst
by dchapyshev＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: dchapyshev Date: Wed Dec 19 12:21:21 2007 New Revision: 31317 URL: http://svn.reactos.org/svn/reactos?rev=31317&view=rev Log: - Add myself to CREDITS (no comments ;)) - Add rasapi32, rasdlg and rasman to apistatus.lst Modified: trunk/reactos/CREDITS trunk/reactos/apistatus.lst Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=31317&r1=31316… ============================================================================== --- trunk/reactos/CREDITS (original) +++ trunk/reactos/CREDITS Wed Dec 19 12:21:21 2007 @@ -13,6 +13,7 @@ Christoph von Wittich <christoph_vw(a)reactos.org> Daniel Reimer <reimer.daniel(a)freenet.de> David Welch <welch(a)cwcom.net> +Dmitry Chapyshev <dmitry(a)reactos.org> Emanuele Aliberti <ea(a)iol.it> Eric Kohl <ekohl(a)rz-online.de> Eugene Ingerman <geneing(a)myrealbox.com> Modified: trunk/reactos/apistatus.lst URL: http://svn.reactos.org/svn/reactos/trunk/reactos/apistatus.lst?rev=31317&r1… ============================================================================== --- trunk/reactos/apistatus.lst (original) +++ trunk/reactos/apistatus.lst Wed Dec 19 12:21:21 2007 @@ -10,6 +10,9 @@ iphlpapi ../reactos/dll/win32/iphlpapi kernel32 ../reactos/dll/win32/kernel32 msvcrt ../reactos/dll/win32/msvcrt +rasapi32 ../reactos/dll/win32/rasapi32 +rasdlg ../reactos/dll/win32/rasdlg +rasman ../reactos/dll/win32/rasman rpcrt4 ../reactos/dll/win32/rpcrt4 secur32 ../reactos/dll/win32/secur32 snmpapi ../reactos/dll/win32/snmpapi

1 0

[dchapyshev] 31316: - Functions for definition BIOS date and version, Domain are added
by dchapyshev＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: dchapyshev Date: Wed Dec 19 11:54:15 2007 New Revision: 31316 URL: http://svn.reactos.org/svn/reactos?rev=31316&view=rev Log: - Functions for definition BIOS date and version, Domain are added Modified: trunk/rosapps/sysutils/systeminfo/lang/de-DE.rc trunk/rosapps/sysutils/systeminfo/lang/en-US.rc trunk/rosapps/sysutils/systeminfo/lang/fr-FR.rc trunk/rosapps/sysutils/systeminfo/resource.h trunk/rosapps/sysutils/systeminfo/systeminfo.c Modified: trunk/rosapps/sysutils/systeminfo/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/lang/d… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/lang/de-DE.rc (original) +++ trunk/rosapps/sysutils/systeminfo/lang/de-DE.rc Wed Dec 19 11:54:15 2007 @@ -1,7 +1,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE -{ +BEGIN IDS_USAGE, "SYSTEMINFO [/S System [/U Benutzername [/P [Passwort]]]] [/FO Format] [/NH]\n\n\ Beschreibung:\n\ @@ -58,5 +58,9 @@ IDS_HOST_NAME, "Domäne: %s\n" IDS_PAGEFILE_LOC, "Auslagerungsdateipfad(e) %s" IDS_TIME_ZONE, "Zeitzone: %s\n" +IDS_DOMINE, "Domain: %s\n" +IDS_BIOS_DATE, "BIOS Date: %s\n" +IDS_BIOS_VERSION, "BIOS Version: %s\n" +IDS_NETWORK_CARDS, "Network Card(s) %u Installed.\n" -} +END Modified: trunk/rosapps/sysutils/systeminfo/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/lang/e… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/lang/en-US.rc (original) +++ trunk/rosapps/sysutils/systeminfo/lang/en-US.rc Wed Dec 19 11:54:15 2007 @@ -1,7 +1,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE DISCARDABLE -{ +BEGIN IDS_USAGE, "SYSTEMINFO [/S system [/U username [/P [password]]]] [/FO format] [/NH]\n\n\ Description:\n\ @@ -54,7 +54,11 @@ IDS_VIRT_MEM_AVAIL, "Virtual Memory: Available: %ld MB (%ld KB)\n" IDS_VIRT_MEM_INUSE, "Virtual Memory: In Use: %ld MB (%ld KB)\n" IDS_HOST_NAME, "Host Name: %s\n" -IDS_PAGEFILE_LOC, "Page File Location(s) %s" +IDS_PAGEFILE_LOC, "Page File Location(s) %s\n" IDS_TIME_ZONE, "Time zone: %s\n" +IDS_DOMINE, "Domain: %s\n" +IDS_BIOS_DATE, "BIOS Date: %s\n" +IDS_BIOS_VERSION, "BIOS Version: %s\n" +IDS_NETWORK_CARDS, "Network Card(s) %u Installed.\n" -} +END Modified: trunk/rosapps/sysutils/systeminfo/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/lang/f… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/lang/fr-FR.rc (original) +++ trunk/rosapps/sysutils/systeminfo/lang/fr-FR.rc Wed Dec 19 11:54:15 2007 @@ -1,9 +1,9 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE -{ +BEGIN -IDS_USAGE, "SYSTEMINFO [/S système [/U utilisateur [/P [motdepasse]]]] [/FO format] [/NH]\n\n\ +IDS_USAGE "SYSTEMINFO [/S système [/U utilisateur [/P [motdepasse]]]] [/FO format] [/NH]\n\n\ Description:\n\ Cet outil en ligne de commande permet à un administrateur d'effectuer une requête sur les informations\n\ basiques de la configuration du système.\n\n\ @@ -56,5 +56,9 @@ IDS_HOST_NAME, "Nom d'hôte: %s\n" IDS_PAGEFILE_LOC, "Emplacement(s) des fichiers d'échange %s" IDS_TIME_ZONE, "Fuseau horaire: %s\n" +IDS_DOMINE, "Domain: %s\n" +IDS_BIOS_DATE, "BIOS Date: %s\n" +IDS_BIOS_VERSION, "BIOS Version: %s\n" +IDS_NETWORK_CARDS, "Network Card(s) %u Installed.\n" -} +END Modified: trunk/rosapps/sysutils/systeminfo/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/resour… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/resource.h (original) +++ trunk/rosapps/sysutils/systeminfo/resource.h Wed Dec 19 11:54:15 2007 @@ -27,3 +27,7 @@ #define IDS_HOST_NAME 124 #define IDS_PAGEFILE_LOC 125 #define IDS_TIME_ZONE 126 +#define IDS_DOMINE 127 +#define IDS_BIOS_DATE 128 +#define IDS_BIOS_VERSION 129 +#define IDS_NETWORK_CARDS 130 Modified: trunk/rosapps/sysutils/systeminfo/systeminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/systeminfo/system… ============================================================================== --- trunk/rosapps/sysutils/systeminfo/systeminfo.c (original) +++ trunk/rosapps/sysutils/systeminfo/systeminfo.c Wed Dec 19 11:54:15 2007 @@ -220,6 +220,18 @@ } //getting BIOS Version + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("HARDWARE\\DESCRIPTION\\System"), + TEXT("SystemBiosVersion"), + Buf)) + if(GetOemStrings(IDS_BIOS_VERSION,Msg)) fprintf(stderr,Msg,Buf); + + //gettings BIOS date + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("HARDWARE\\DESCRIPTION\\System"), + TEXT("SystemBiosDate"), + Buf)) + if(GetOemStrings(IDS_BIOS_DATE,Msg)) fprintf(stderr,Msg,Buf); //getting ReactOS Directory if(!GetWindowsDirectory(Buf,BUFFER_SIZE)) printf("Error getting: GetWindowsDirectory"); @@ -327,11 +339,19 @@ } //getting Domain + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon"), + TEXT("CachePrimaryDomain"), + Buf)) + if(GetOemStrings(IDS_DOMINE,Msg)) fprintf(stderr,Msg,Buf); //getting Logon Server //getting NetWork Card(s) - + if(GetOemStrings(IDS_NETWORK_CARDS,Msg)) + { + + } } /* Main program */

1 0

[dchapyshev] 31315: - Update Russian translation
by dchapyshev＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: dchapyshev Date: Wed Dec 19 11:44:31 2007 New Revision: 31315 URL: http://svn.reactos.org/svn/reactos?rev=31315&view=rev Log: - Update Russian translation Modified: trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc Modified: trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/r… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc Wed Dec 19 11:44:31 2007 @@ -117,10 +117,10 @@ IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Î ïðîãðàììå FreeLoader Debugger" +CAPTION "Î ïðîãðàììå Îòëàä÷èê FreeLoader" FONT 8, "Tahoma" BEGIN - CONTROL "FreeLoader Debugger v1.0\nCopyright (C) 2003\nîò Brian Palmer (brianp(a)reactos.org)", + CONTROL "Îòëàä÷èê FreeLoader v1.0\nÀâòîðñêèå ïðàâà (C) 2003\nÁðàèí Ïàëìåð (brianp(a)reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, 122,26 DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP @@ -170,7 +170,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." + IDS_LICENSE "Ýòà ïðîãðàììà ÿâëÿåòñÿ ñâîáîäíûì ïðîãðàììíûì îáåñïå÷åíèåì; Âû ìîæåòå ðàñïðîñòðàíÿòü è/èëè èçìåíÿòü åå â ñîîòâåòñòâèè ñ ëèöåíçèåé GNU General Public License âåðñèè 2 èëè áîëåå ïîçäíåé, îïóáëèêîâàííîé Free Software Foundation.\r\n\r\nÝòà ïðîãðàììà ðàñïðîñòðàíÿåòñÿ ñ íàäåæäîé, ÷òî îíà ìîæåò áûòü ïîëåçíà, íî ÁÅÇ ÂÑßÊÎÉ ÃÀÐÀÍÒÈÈ; íå ïîäðàçóìåâàåòñÿ äàæå ÐÀÁÎÒÎÑÏÎÑÎÁÍÎÑÒÜ èëè ÏÐÈÃÎÄÍÎÑÒÜ ÄËß ÂÛÏÎËÍÅÍÈß ÍÅÎÁÕÎÄÈÌÛÕ ÇÀÄÀ×. Ñì. GNU General Public License äëÿ ïîëó÷åíèÿ äîïîëíèòåëüíûõ ñâåäåíèé.\r\n\r\nÂû äîëæíû ïîëó÷èòü êîïèþ ëèöåíçèè GNU âìåñòå ñ ýòîé ïðîãðàììîé, â ïðîòèâíîì ñëó÷àå îáðàùàéòåñü â Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END #endif

1 0

[dchapyshev] 31314: - Fix Russian Translation for mstsc - Fix English Translation for servman
by dchapyshev＠svn.reactos.org 19 Dec '07

19 Dec '07

Author: dchapyshev Date: Wed Dec 19 11:42:33 2007 New Revision: 31314 URL: http://svn.reactos.org/svn/reactos?rev=31314&view=rev Log: - Fix Russian Translation for mstsc - Fix English Translation for servman Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mstsc/lang/ru-RU.rc 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 Wed Dec 19 11:42:33 2007 @@ -68,7 +68,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 26 + LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 30 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Modified: trunk/reactos/base/applications/mstsc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/ru-RU.rc Wed Dec 19 11:42:33 2007 @@ -15,7 +15,7 @@ PUSHBUTTON "Ñîõðàíèòü êàê...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "Îòêðûòü...",IDC_OPEN,177,139,50,14 ICON "", IDC_CONNICON, 16,114,20,20 - LTEXT "Ñîõðàíèòü òåêóùèå íàñòðîéêè ïîäêëþ÷åíèÿ èëè îòêðûòü ñóùåñòóþùóþ êîíôèãóðàöèþ",IDC_STATIC,50,115,172,20 + LTEXT "Ñîõðàíèòü òåêóùèå íàñòðîéêè ïîäêëþ÷åíèÿ èëè îòêðûòü ñóùåñòâóþùóþ êîíôèãóðàöèþ",IDC_STATIC,50,115,172,20 END IDD_DISPLAY DIALOGEX 0, 0, 242, 175 @@ -30,7 +30,7 @@ CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 - LTEXT "Ïðèìå÷àíèå: Íàñòðîéêè óäàëåííîãî êîìïüþòåðà îïðåäåëÿþò ýòè ïàðàìåòðû.",IDC_STATIC,56,143,165,18 + LTEXT "Ïðèìå÷àíèå: Ýòè ïàðàìåòðû îïðåäåëÿþòñÿ íàñòðîéêàìè óäàëåííîãî êîìïüþòåðà.",IDC_STATIC,56,143,165,18 LTEXT "Ìåíüøå",IDC_STATIC,35,52,15,8 LTEXT "Áîëüøå",IDC_STATIC,189,51,17,8 LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER @@ -51,7 +51,7 @@ BEGIN IDS_TAB_GENERAL "Îáùèå" IDS_TAB_DISPLAY "Ýêðàí" - IDS_256COLORS "256 Öâåòîâ" + IDS_256COLORS "256 öâåòîâ" IDS_HIGHCOLOR15 "Ðàçðåøåíèå (15 áèò)" IDS_HIGHCOLOR16 "Ðàçðåøåíèå (16 áèò)" IDS_HIGHCOLOR24 "Ðàçðåøåíèå (24 áèò)"

1 0

[mpiulachs] 31313: Add r31312 new translations to build
by mpiulachs＠svn.reactos.org 18 Dec '07

18 Dec '07

Author: mpiulachs Date: Wed Dec 19 02:15:35 2007 New Revision: 31313 URL: http://svn.reactos.org/svn/reactos?rev=31313&view=rev Log: Add r31312 new translations to build Modified: trunk/reactos/base/applications/mmc/rsrc.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/boot/freeldr/fdebug/fdebug.rc trunk/reactos/dll/win32/console/rsrc.rc Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… ============================================================================== --- trunk/reactos/base/applications/mmc/rsrc.rc (original) +++ trunk/reactos/base/applications/mmc/rsrc.rc Wed Dec 19 02:15:35 2007 @@ -5,6 +5,7 @@ #include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" +#include "lang/es-ES.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/nb-NO.rc" Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc Wed Dec 19 02:15:35 2007 @@ -16,6 +16,7 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.rc (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.rc Wed Dec 19 02:15:35 2007 @@ -8,6 +8,7 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/id-ID.rc" Modified: trunk/reactos/dll/win32/console/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/console/rsrc.rc (original) +++ trunk/reactos/dll/win32/console/rsrc.rc Wed Dec 19 02:15:35 2007 @@ -5,6 +5,7 @@ #include "lang/en-US.rc" #include "lang/de-DE.rc" +#include "lang/es-ES.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/pl-PL.rc"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs