Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[ekohl] 30559: List all user profiles (SIDs only).
by ekohl＠svn.reactos.org 18 Nov '07

18 Nov '07

Author: ekohl Date: Sun Nov 18 22:54:04 2007 New Revision: 30559 URL: http://svn.reactos.org/svn/reactos?rev=30559&view=rev Log: List all user profiles (SIDs only). Modified: trunk/reactos/dll/cpl/sysdm/userprofile.c Modified: trunk/reactos/dll/cpl/sysdm/userprofile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/userprofile.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/userprofile.c (original) +++ trunk/reactos/dll/cpl/sysdm/userprofile.c Sun Nov 18 22:54:04 2007 @@ -62,10 +62,63 @@ static VOID +AddUserProfile(HWND hwndListView, + LPTSTR lpProfileSid) +{ + LV_ITEM lvi; + INT iItem; + + memset(&lvi, 0x00, sizeof(lvi)); + lvi.mask = LVIF_TEXT | LVIF_STATE; + lvi.pszText = lpProfileSid; + lvi.state = 0; + iItem = ListView_InsertItem(hwndListView, &lvi); +} + + +static VOID +AddUserProfiles(HWND hwndListView) +{ + HKEY hKeyUserProfiles; + DWORD dwIndex; + TCHAR szProfileSid[64]; + DWORD dwSidLength; + FILETIME ftLastWrite; + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + _T("Software\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList"), + 0, + KEY_READ, + &hKeyUserProfiles)) + return; + + for (dwIndex = 0; ; dwIndex++) + { + dwSidLength = 64; + if (RegEnumKeyEx(hKeyUserProfiles, + dwIndex, + szProfileSid, + &dwSidLength, + NULL, + NULL, + NULL, + &ftLastWrite)) + break; + + AddUserProfile(hwndListView, szProfileSid); + } + + RegCloseKey(hKeyUserProfiles); +} + + +static VOID OnInitDialog(HWND hwndDlg) { /* Initialize the list view control */ SetListViewColumns(GetDlgItem(hwndDlg, IDC_USERPROFILE_LIST)); + + AddUserProfiles(GetDlgItem(hwndDlg, IDC_USERPROFILE_LIST)); /* Disable the "Delete" and "Copy To" buttons if the user is not an admin */ if (!IsUserAdmin())

1 0

[fireball] 30558: - Make .def file more consinsten with mingw's syntax (by aicommander).
by fireball＠svn.reactos.org 18 Nov '07

18 Nov '07

Author: fireball Date: Sun Nov 18 22:15:11 2007 New Revision: 30558 URL: http://svn.reactos.org/svn/reactos?rev=30558&view=rev Log: - Make .def file more consinsten with mingw's syntax (by aicommander). Modified: trunk/reactos/dll/win32/opengl32/opengl32.def Modified: trunk/reactos/dll/win32/opengl32/opengl32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.def (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.def Sun Nov 18 22:15:11 2007 @@ -383,7 +383,7 @@ wglDescribePixelFormat@16=rosglDescribePixelFormat@16 wglGetCurrentContext@0=rosglGetCurrentContext@0 wglGetCurrentDC@0=rosglGetCurrentDC@0 -wglGetDefaultProcAddress=rosglGetDefaultProcAddress@4 +wglGetDefaultProcAddress@4=rosglGetDefaultProcAddress@4 wglGetLayerPaletteEntries@20=rosglGetLayerPaletteEntries@20 wglGetPixelFormat@4=rosglGetPixelFormat@4 wglGetProcAddress@4=rosglGetProcAddress@4

1 0

[cwittich] 30557: fix most compilation issues with msvc
by cwittich＠svn.reactos.org 18 Nov '07

18 Nov '07

Author: cwittich Date: Sun Nov 18 22:00:17 2007 New Revision: 30557 URL: http://svn.reactos.org/svn/reactos?rev=30557&view=rev Log: fix most compilation issues with msvc Modified: trunk/reactos/drivers/bus/acpi/executer/amutils.c trunk/reactos/drivers/bus/acpi/ospm/fdo.c trunk/reactos/drivers/bus/acpi/ospm/osl.c Modified: trunk/reactos/drivers/bus/acpi/executer/amutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/executer/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/executer/amutils.c (original) +++ trunk/reactos/drivers/bus/acpi/executer/amutils.c Sun Nov 18 22:00:17 2007 @@ -246,7 +246,7 @@ } else { - for (num_digits = 1 + (val < 0); (val = ACPI_DIVIDE (val,base)); ++num_digits) { ; } + for (num_digits = 1; (val = ACPI_DIVIDE (val,base)); ++num_digits) { ; } } return (num_digits); Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/ospm/fdo.… ============================================================================== --- trunk/reactos/drivers/bus/acpi/ospm/fdo.c (original) +++ trunk/reactos/drivers/bus/acpi/ospm/fdo.c Sun Nov 18 22:00:17 2007 @@ -108,7 +108,7 @@ swprintf(Buffer, L"%S", Node->device.id.uid); else /* FIXME: Generate unique id! */ - swprintf(Buffer, L"0000"); + swprintf(Buffer, L"%S", L"0000"); return AcpiCreateUnicodeString(InstanceID, Buffer, PagedPool); } Modified: trunk/reactos/drivers/bus/acpi/ospm/osl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/ospm/osl.… ============================================================================== --- trunk/reactos/drivers/bus/acpi/ospm/osl.c (original) +++ trunk/reactos/drivers/bus/acpi/ospm/osl.c Sun Nov 18 22:00:17 2007 @@ -302,38 +302,38 @@ WRITE_PORT_ULONG((PULONG)port, val); } -UINT8 +u8 acpi_os_mem_in8 (ACPI_PHYSICAL_ADDRESS phys_addr) { return (*(PUCHAR)(ULONG)phys_addr); } -UINT16 +u16 acpi_os_mem_in16 (ACPI_PHYSICAL_ADDRESS phys_addr) { return (*(PUSHORT)(ULONG)phys_addr); } -UINT32 +u32 acpi_os_mem_in32 (ACPI_PHYSICAL_ADDRESS phys_addr) { return (*(PULONG)(ULONG)phys_addr); } void -acpi_os_mem_out8 (ACPI_PHYSICAL_ADDRESS phys_addr, UINT8 value) +acpi_os_mem_out8 (ACPI_PHYSICAL_ADDRESS phys_addr, u8 value) { *(PUCHAR)(ULONG)phys_addr = value; } void -acpi_os_mem_out16 (ACPI_PHYSICAL_ADDRESS phys_addr, UINT16 value) +acpi_os_mem_out16 (ACPI_PHYSICAL_ADDRESS phys_addr, u16 value) { *(PUSHORT)(ULONG)phys_addr = value; } void -acpi_os_mem_out32 (ACPI_PHYSICAL_ADDRESS phys_addr, UINT32 value) +acpi_os_mem_out32 (ACPI_PHYSICAL_ADDRESS phys_addr, u32 value) { *(PULONG)(ULONG)phys_addr = value; }

1 0

[cwittich] 30556: forgot to add #ifdef MSVC_VER
by cwittich＠svn.reactos.org 18 Nov '07

18 Nov '07

Author: cwittich Date: Sun Nov 18 21:20:07 2007 New Revision: 30556 URL: http://svn.reactos.org/svn/reactos?rev=30556&view=rev Log: forgot to add #ifdef MSVC_VER Modified: trunk/reactos/dll/win32/aclui/guid.c trunk/reactos/dll/win32/aclui/precomp.h Modified: trunk/reactos/dll/win32/aclui/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/guid.c?rev… ============================================================================== --- trunk/reactos/dll/win32/aclui/guid.c (original) +++ trunk/reactos/dll/win32/aclui/guid.c Sun Nov 18 21:20:07 2007 @@ -24,6 +24,8 @@ #include <aclui.h> #include <objsel.h> +#ifdef _MSC_VER #include <precomp.h> +#endif /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Modified: trunk/reactos/dll/win32/aclui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/aclui/precomp.h (original) +++ trunk/reactos/dll/win32/aclui/precomp.h Sun Nov 18 21:20:07 2007 @@ -10,7 +10,7 @@ #include <aclui.h> #include <sddl.h> #include <ntsecapi.h> -#if SUPPORT_UXTHEME +#ifdef SUPPORT_UXTHEME #include <uxtheme.h> #include <tmschema.h> #endif

1 0

[cwittich] 30555: fix compilation with msvc
by cwittich＠svn.reactos.org 18 Nov '07

18 Nov '07

Author: cwittich Date: Sun Nov 18 20:58:05 2007 New Revision: 30555 URL: http://svn.reactos.org/svn/reactos?rev=30555&view=rev Log: fix compilation with msvc Modified: trunk/reactos/dll/win32/aclui/guid.c Modified: trunk/reactos/dll/win32/aclui/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/guid.c?rev… ============================================================================== --- trunk/reactos/dll/win32/aclui/guid.c (original) +++ trunk/reactos/dll/win32/aclui/guid.c Sun Nov 18 20:58:05 2007 @@ -24,4 +24,6 @@ #include <aclui.h> #include <objsel.h> +#include <precomp.h> + /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

1 0

[pschweitzer] 30554: Log directory is created if it doesn't exists.
by pschweitzer＠svn.reactos.org 18 Nov '07

18 Nov '07

Author: pschweitzer Date: Sun Nov 18 20:49:19 2007 New Revision: 30554 URL: http://svn.reactos.org/svn/reactos?rev=30554&view=rev Log: Log directory is created if it doesn't exists. Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Sun Nov 18 20:49:19 2007 @@ -43,9 +43,12 @@ if (!SetCurrentDirectoryW(logdir)) { SetCurrentDirectoryW(checklog); - if (LoadStringW(hInstance, MSG_DIREFAILED, msgerror, 256)) - MessageBoxW(NULL, msgerror, NULL, MB_ICONERROR); - return FALSE; + if (CreateDirectoryW(logdir, NULL) == 0) + { + if (LoadStringW(hInstance, MSG_DIREFAILED, msgerror, 256)) + MessageBoxW(NULL, msgerror, NULL, MB_ICONERROR); + return FALSE; + } } } }

1 0

[janderwald] 30553: - add rtf file association by Cameron Gutman aicommander [at] gmail [dot] com - add shellnew static handler
by janderwald＠svn.reactos.org 18 Nov '07

18 Nov '07

Author: janderwald Date: Sun Nov 18 20:29:52 2007 New Revision: 30553 URL: http://svn.reactos.org/svn/reactos?rev=30553&view=rev Log: - add rtf file association by Cameron Gutman aicommander [at] gmail [dot] com - add shellnew static handler Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf (original) +++ trunk/reactos/boot/bootdata/hivecls.inf Sun Nov 18 20:29:52 2007 @@ -27,6 +27,14 @@ HKCR,"CLSID\{D969A300-E7FF-11d0-A93B-00A0C90F2719}\InProcServer32","",0x00000000,"shell32.dll" HKCR,"CLSID\{D969A300-E7FF-11d0-A93B-00A0C90F2719}\InProcServer32","ThreadingModel",0x00000000,"Apartment" +; Rich Text Files +HKCR,".rtf","",0x00000000,"rtffile" +HKCR,".rtf\shellnew","",0x00000000,"" +HKCR,".rft\shellnew","Data",0x00020000,"{\rtf1}" +HKCR,"rtffile","",0x00000000,"Rich Text Document" +HKCR,"rtffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-2" +HKCR,"rtffile\shell\open","",0x00000000,"Open" +HKCR,"rtffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\wordpad.exe %1" ; Virtual Device Drivers HKCR,".386","",0x00000000,"vxdfile"

1 0

[fireball] 30552: Igor Koshpaev <tumans@nm.ru> - Add russian translations for input.dll and rasapi32.dll
by fireball＠svn.reactos.org 18 Nov '07

18 Nov '07

Author: fireball Date: Sun Nov 18 19:49:29 2007 New Revision: 30552 URL: http://svn.reactos.org/svn/reactos?rev=30552&view=rev Log: Igor Koshpaev <tumans(a)nm.ru> - Add russian translations for input.dll and rasapi32.dll Added: trunk/reactos/dll/cpl/input/lang/ru-RU.rc (with props) trunk/reactos/dll/win32/rasapi32/lang/ru-RU.rc (with props) Modified: trunk/reactos/dll/cpl/input/rsrc.rc trunk/reactos/dll/win32/rasapi32/rsrc.rc Added: trunk/reactos/dll/cpl/input/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ru-RU.rc (added) +++ trunk/reactos/dll/cpl/input/lang/ru-RU.rc Sun Nov 18 19:49:29 2007 @@ -1,0 +1,376 @@ +// Russian Language File translated by towerr (tumans(a)nm.ru) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_PROPPAGESETTINGS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óñòàíîâêè" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Îñíîâíîé ÿçûê ââîäà", -1, 7,7,231,53 + LTEXT "Âûáåðèòå îäèí îñíîâíîé ÿçûê ââîäà ïðè âêëþ÷åíèè êîìïüþòåðà.",-1,14,18,220,17 + COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST | CBS_SORT + GROUPBOX "Óñ&òàíîâëåííûå ñåðâèñû", -1, 7,65,231,115 + LTEXT "Âûáåðèòå ñåðâèñ êîòîðûé âû õîòèòå äëÿ êàæäîãî ÿçûêà îòîáðàæîííîãî â ëèñòå. Èñïîëüçóÿ êëàâèøè äîáàâëåíèå è èñêëþ÷åíèå äëÿ èçìåíåíèÿ ëèñòà.",-1,14,75,220,17 + CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78 + PUSHBUTTON "&Óñòàíîâèòü ïî óìîë÷àíèþ", IDC_SET_DEFAULT, 179, 106, 53, 14 + PUSHBUTTON "&Äîáàâèòü...", IDC_ADD_BUTTON, 179, 124, 53, 14 + PUSHBUTTON "&Èñêëþ÷èòü...", IDC_REMOVE_BUTTON, 179, 142, 53, 14 + PUSHBUTTON "&Ñâîéñòâà...", IDC_PROP_BUTTON, 179, 160, 53, 14 + GROUPBOX "Ñâîéñòâà", -1, 7,185,231,36 + PUSHBUTTON "ßçûêîâàÿ ïàíåëü...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14 + PUSHBUTTON "Óñòàíîâêè êëàâèø...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 +END + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Äîïîëíèòåëüíî" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Êîíôèãóðàöèÿ ñîâìåñòèìîñòè", -1, 7,7,231,60 + AUTOCHECKBOX "&Ðàñøèðåííàÿ ïîääåðæêà äîïîëíèòåëüíûõ òåêñòîâûõ ñåðâèñîâ äëÿ âñåõ ïðîãðàìì", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP + LTEXT "Îòìåòüòå ãàëî÷êîé çäåñü ïðè íåîáõîäèìîñòè âêëþ÷åíèÿ äîïîëíèòåëüíûõ ñåðâèñîâ äëÿ ïðîãðàìì êîòîðûå íåìîãóò ïîääåðæèâàòü ãîëîñîâîå ñîïðîâîæäåíèå, èëè ðàñïîçíàâàíèå, è äðóãèõ äîïîëíèòåëüíûõ ñåðâèñîâ ââîäà.",-1,14,33,220,25 + GROUPBOX "Êîíôèãóðàöèÿ ñèñòåìû", -1, 7,74,231,60 + AUTOCHECKBOX "&Îòêëþ÷èòü äîïîëíèòåëüíûå òåêñòîâûå ñåðâèñû", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP + LTEXT "Îòìåòüòå ãàëî÷êîé çäåñü äëÿ îòêëþ÷åíèÿ äîïîëíèòåëüíûõ òåêñòîâûõ ñåðâèñîâ âî âñåõ ïðîãðàììàõ. Íåðåêîìåíäîâàíî äëÿ ïîëüçîâàòåëåé Âîñòî÷íîé Àçèè äàííîå äåéñòâèå ïîëíîñòüþ îòêëþ÷èò äîñòóï ê ÿçûêîâîé ïàíåëè.",-1,14,100,220,25 +END + +IDD_LANGBAR DIALOG 20, 20, 240, 120 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Óñòàíîâêà ÿçûêîâîé ïàíåëè" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 7, 7, 226, 85 + AUTOCHECKBOX "Îòîáðàæàòü ÿçûêîâóþ ïàíåëü íà ýêðàíå", IDC_LANGBAR_ON_DESK_CHECKBOX, 17, 17, 210, 10, WS_GROUP + AUTOCHECKBOX "&Ïðîçðà÷íîñü ÿçûêîâîé ïàíåëè", IDC_LANGBAR_TRANSP_INACT_CHECKBOX, 17, 32, 210, 10 + AUTOCHECKBOX "&Äîïîëíèòåëüíûå èêîíêè ÿçûêîâîé ïàíåëè â îáëàñòè óâåäîìëåíèé", IDC_ADDIT_LANGBAR_ICON_NOTIFYAREA_CHECKBOX, 17, 47, 210, 10 + AUTOCHECKBOX "Ïîêàçûâàòü ïîäïèñè ê ÿðëûêàì â ïàíåëè ÿçûêîâ", IDC_TEXTLABEL_ON_LANGBAR_CHECKBOX, 17, 62, 210, 10 + AUTOCHECKBOX "&Îòêëþ÷èòü äîïîëíèòåëüíûå òåêñòîâûå ñåðâèñû", IDC_OFF_ADVAN_TEXTSERV_CHECKBOX, 17, 77, 200, 10 + DEFPUSHBUTTON "OK", IDOK, 129, 99, 50, 14 + PUSHBUTTON "Îòìåíèòü", IDCANCEL, 182, 99, 50, 14 +END + +IDD_KEYSETTINGS DIALOG 0, 0, 272, 163 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Äîïîëíèòåëüíûõ óñòàíîâêè" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Äëÿ îòêëþ÷åíèÿ Caps Lock", -1, 7, 7, 258, 26 + AUTORADIOBUTTON "Íàæìèòå êëàâèøó CAPS &LOCK", IDC_PRESS_CAPSLOCK_KEY_RADIOBTN, 14, 17, 120, 11, WS_GROUP + AUTORADIOBUTTON "Íàæìèòå êëàâèøó SHI&FT", IDC_PRESS_SHIFT_KEY_RADIOBTN, 144, 17, 120, 11, NOT WS_TABSTOP + GROUPBOX "Ãîðÿ÷èå êëàâèøè ÿçûêîâ", -1, 7, 37, 258, 95 + LTEXT "Äåéñòâèå", -1, 14, 47, 60, 9 + RTEXT "Ñî&÷åòàíèå êëàâèø", -1, 177, 47, 79, 9 + LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Èçìåíèòü ñî÷åòàíèå êëàâèø...", IDC_CHANGE_KEY_SEQ_BUTTON, 152, 113, 106, 14, WS_GROUP + DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 + PUSHBUTTON "Îòìåíèòü", IDCANCEL, 146, 140, 70, 14 +END + +IDD_ADD DIALOG 20, 20, 227, 90 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Äîáàâèòü ÿçûê ââîäà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&ßçûê ââîäà:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "&Ðàñêëàäêà êëàâèàòóðû/IME:", -1, 7, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 + PUSHBUTTON "Îòìåíèòü", IDCANCEL, 169, 68, 50, 14 +END + +IDD_ADD2 DIALOG 20, 20, 257, 176 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Äîáàâèòü ÿçûê ââîäà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&ßçûê ââîäà:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Ðàñêëàäêà êëàâèàòóðû/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "Ðàñïî&çíàâàíèå ðó÷íîãî ââîäà:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Ãîëîñ:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Ñåðâèñû òåêñòîâ:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10 + COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14 + PUSHBUTTON "Îòìåíèòü", IDCANCEL, 199, 155, 50, 14 +END + +IDD_ADD3 DIALOG 20, 20, 257, 147 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Äîáàâèòü ÿçûê ââîäà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&ßçûê ââîäà:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Ðàñêëàäêà êëàâèàòóðû/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "Ðàñïî&çíàâàíèå ðó÷íîãî ââîäà:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Ãîëîñ:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14 + PUSHBUTTON "Îòìåíèòü", IDCANCEL, 199, 126, 50, 14 +END + +IDD_CHANGE_KEY_SEQ2 DIALOG 5, 100, 269, 78 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Èçìåíåíèå ñî÷åòàíèÿ êëàâèø" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", -1, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "&Âêëþ÷èòü ñî÷åòàíèå êëàâèø", IDC_ENABLE_KEY_SEQ_CHECKBOX, 17, 17, 85, 8 + CTEXT "SHIFT", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + CTEXT "+", -1, 98, 37, 8, 10 + CHECKBOX "&CTRL", IDC_CTRL_CHECKBOX, 24, 31, 30, 11, NOT WS_TABSTOP + CHECKBOX "&ALT", IDC_ALT_CHECKBOX, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Êëàâèøà:", -1, 110, 37, 14, 10 + COMBOBOX IDC_CKEY_COMBOBOX, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Îòìåíèòü", IDCANCEL, 212, 47, 50, 14 +END + +IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 285, 74 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Èçìåíåíèå ñî÷åòàíèÿ êëàâèø" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 9, 5, 209, 60 + AUTOCHECKBOX "Ïåð&åêëþ÷àòü ÿçûê ââîäà", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Ëåâûé &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Ïåðå&êëþ÷åíèå ðàñêëàäîê êëàâèàòóðû", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12 + LTEXT "SHIFT", -1, 179, 37, 27, 12 + CTEXT "+", -1, 168, 37, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Ëåâûé A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 + PUSHBUTTON "Îòìåíèòü", IDCANCEL, 227, 44, 50, 14 +END + +IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 249, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Èçìåíåíèå ñî÷åòàíèÿ êëàâèø" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "Ïåð&åêëþ÷àòü ÿçûê ââîäà", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Ëåâûé &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Ïåðå&êëþ÷åíèå ðàñêëàäîê êëàâèàòóðû", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33 + AUTORADIOBUTTON "Âñòàâèòü &óäàðåíèå ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Ëåâûé A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Îòìåíèòü", IDCANCEL, 192, 47, 50, 14 +END + +IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 249, 125 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Èçìåíåíèå ñî÷åòàíèÿ êëàâèø" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "Ïåð&åêëþ÷àòü ÿçûê ââîäà", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12 + LTEXT "SHIFT", -1, 73, 37, 27, 12 + CTEXT "+", -1, 62, 37, 8, 9 + CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33 + AUTORADIOBUTTON "Âñòàâèòü &óäàðåíèå ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Ëåâûé &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "Ïåðå&êëþ÷åíèå ðàñêëàäîê êëàâèàòóðû", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12 + LTEXT "SHIFT", -1, 73, 87, 27, 12 + CTEXT "+", -1, 62, 87, 8, 9 + AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, WS_GROUP + AUTORADIOBUTTON "Ëåâûé A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Îòìåíèòü", IDCANCEL, 192, 47, 50, 14 +END + +IDD_CHANGE_KEY_SEQ5 DIALOG 5, 100, 269, 78 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Èçìåíåíèå ñî÷åòàíèÿ êëàâèø" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", 1240, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "&Âêëþ÷èòü ñî÷åòàíèå êëàâèø", 1249, 17, 17, 85, 8 + CTEXT "SHIFT", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + CTEXT "+", -1, 98, 37, 8, 10 + AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP + AUTORADIOBUTTON "Ëåâûé &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Êëàâèøà:", -1, 110, 37, 14, 10 + COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Îòìåíèòü", IDCANCEL, 212, 47, 50, 14 +END + +IDD_INPUT_LANG_PROP DIALOG 20, 20, 227, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñâîéñòâà ââîäà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ßçûê ââîäà:", -1, 7, 7, 61, 8 + LTEXT "", -1, 73, 7, 129, 8 + LTEXT "&Ðàñêëàäêà êëàâèàòóðû/IME:", -1, 7, 21, 110, 10 + COMBOBOX IDC_KEYBOARD_LAYOUT_IME_COMBO, 7, 32, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 + PUSHBUTTON "Îòìåíèòü", IDCANCEL, 169, 53, 52, 14 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Òåêñòîâûå ñåðâèñû è ââîä ÿçûêîâ" + IDS_CPLSYSTEMDESCRIPTION "Äîïîëíèòåëüíûå óñòàíîâêè òåêñòîâîãî ââîäà ÿçûêîâ." +END + +STRINGTABLE +BEGIN + //Selected language on "Add Input language" + IDS_SELECTED_LANGUAGE "English (United States)" + //Selected keyboard layout on "Add Input language" + IDS_SELECTED_LAYOUT, "United States-Dvorak" + IDS_US_LAYOUT, "US" + IDS_BELGIAN_LAYOUT, "Belgian (Period)" + IDS_BELGIAN_FRENCH_LAYOUT, "Belgian French" + IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Portuguese (Brazilian ABNT)" + IDS_CANADIAN_FRENCH_LAYOUT, "Canadian French" + IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "Canadian French (Legacy)" + IDS_DANISH_LAYOUT, "Danish" + IDS_DUTCH_LAYOUT, "Dutch" + IDS_FINNISH_LAYOUT, "Finnish" + IDS_FRENCH_LAYOUT, "French" + IDS_GERMAN_LAYOUT, "German" + IDS_GERMAN_IBM_LAYOUT, "German (IBM)" + IDS_ICELANDIC_LAYOUT, "Icelandic" + IDS_IRISH_LAYOUT, "Irish" + IDS_ITALIAN_LAYOUT, "Italian" + IDS_ITALIAN_142_LAYOUT, "Italian (142)" + IDS_LATIN_AMERICAN_LAYOUT, "Latin American" + IDS_NORWEGIAN_LAYOUT, "Norwegian" + IDS_PORTUGUESE_LAYOUT, "Portuguese" + IDS_SPANISH_LAYOUT, "Spanish" + IDS_SPANISH_VARIANTION_LAYOUT, "Spanish Variation" + IDS_SWEDISH_LAYOUT, "Swedish" + IDS_SWISS_FRENCH_LAYOUT, "Swiss French" + IDS_SWISS_GERMAN_LAYOUT, "Swiss German" + IDS_UNITED_KINGDOM_LAYOUT, "United Kingdom" + IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "United States-International" + IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "United States-Dvorak for left hand" + IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "United States-Dvorak for right hand" + IDS_ALBANIAN_LAYOUT, "Albanian" + IDS_CROATIAN_LAYOUT, "Croatian" + IDS_CZECH_LAYOUT, "Czech" + IDS_CZECH_QWERTY_LAYOUT, "Czech (QWERTY)" + IDS_HUNGARIAN_LAYOUT, "Hungarian" + IDS_HUNGARIAN_101_KEY_LAYOUT, "Hungarian 101-key" + IDS_POLISH_LAYOUT, "Polish (Programmers)" + IDS_POLISH_214_LAYOUT, "Polish (214)" + IDS_ROMANIAN_LAYOUT, "Romanian" + IDS_SERBIAN_LATIN_LAYOUT, "Serbian (Latin)" + IDS_SLOVAK_LAYOUT, "Slovak" + IDS_SLOVAK_QWERTY_LAYOUT, "Slovak (QWERTY)" + IDS_SLOVENIAN_LAYOUT, "Slovenian" + IDS_ESTONIAN_LAYOUT, "Estonian" + IDS_LATVIAN_LAYOUT, "Latvian" + IDS_LATVIAN_QWERTY_LAYOUT, "Latvian (QWERTY)" + IDS_LITHUANIAN_IBM_LAYOUT, "Lithuanian IBM" + IDS_GREEK_LAYOUT, "Greek" + IDS_GREEK_LATIN_LAYOUT, "Greek Latin" + IDS_GREEK_220_LAYOUT, "Greek (220)" + IDS_GREEK_319_LAYOUT, "Greek (319)" + IDS_GREEK_220_LATIN_LAYOUT, "Greek (220) Latin" + IDS_GREEK_319_LATIN_LAYOUT, "Greek (319) Latin" + IDS_BELARUSIAN_LAYOUT, "Belarusian" + IDS_BULGARIAN_LAYOUT, "Bulgarian" + IDS_BULGARIAN_LATIN_LAYOUT, "Bulgarian (Latin)" + IDS_RUSSIAN_LAYOUT, "Russian" + IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Russian (Typewriter)" + IDS_SERBIAN_CYRILLIC_LAYOUT, "Serbian (Cyrillic)" + IDS_UKRAINIAN_LAYOUT, "Ukrainian" + IDS_TURKISH_F_LAYOUT, "Turkish F" + IDS_TURKISH_Q_LAYOUT, "Turkish Q" + IDS_JAPANESE_LAYOUT, "Japanese" + IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "Japanese Input System (MS-IME2002)" + IDS_KOREAN_LAYOUT, "Korean" + IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "Korean Input System (MS-IME2002)" + IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Chinese (Traditional) - US Keyboard" + IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Chinese (Traditional) - Phonetic" + IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Chinese (Traditional) - ChangJie" + IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Chinese (Traditional) - Big5 Code" + IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Chinese (Traditional) - DaYi" + IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Chinese (Traditional) - Unicode" + IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Chinese (Traditional) - Alphanumeric" + IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Chinese (Simplified) - US Keyboard" + IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Chinese (Simplified) - QuanPin" + IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Chinese (Simplified) - ShuangPin" + IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Chinese (Simplified) - ZhengMa" + IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Chinese (Simplified) - NeiMa" + IDS_THAI_KEDMANEE_LAYOUT, "Thai Kedmanee" + IDS_THAI_PATTACHOTE_LAYOUT, "Thai Pattachote" + IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Thai Kedmanee (non-ShiftLock)" + IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Thai Pattachote (non-ShiftLock)" + IDS_HEBREW_LAYOUT, "Hebrew" + IDS_ARABIC_101_LAYOUT, "Arabic (101)" + IDS_ARABIC_102_LAYOUT, "Arabic (102)" + IDS_ARABIC_102_AZERTY_LAYOUT, "Arabic (102) AZERTY" + IDS_CZECH_PROGRAMMERS_LAYOUT, "Czech Programmers" + IDS_LITHUANIAN_LAYOUT, "Lithuanian" + IDS_BELGIAN_COMMA_LAYOUT, "Belgian (Comma)" + IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Chinese (Traditional) - New Phonetic" + IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Chinese (Simplified) - Microsoft Pinyin IME 3.0" + IDS_UNITED_STATES_DVIRAK_LAYOUT, "United States-Dvorak" + IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Chinese (Traditional) - New ChangJie" + IDS_ASSAMESE_LAYOUT, "Assamese" + IDS_BENGALI_LAYOUT, "Bengali" + IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Devanagari - INSCRIPT" + IDS_GUJARATI_LAYOUT, "Gujarati" + IDS_KANNADA_LAYOUT, "Kannada" + IDS_MALAYALAM_LAYOUT, "Malayalam" + IDS_ORIYA_LAYOUT, "Oriya" + IDS_PUNJABI_LAYOUT, "Punjabi" + IDS_TAMIL_LAYOUT, "Tamil" + IDS_TELUGU_LAYOUT, "Telugu" + IDS_MARATHI_LAYOUT, "Marathi" + IDS_HINDI_TRADITIONAL_LAYOUT, "Hindi Traditional" + IDS_CANTONESE_PHONETIC_LAYOUT, "Cantonese Phonetic" + IDS_FAEROESE_LAYOUT, "Faeroese" + IDS_FYRO_MACEDONIAN_LAYOUT, "FYRO Macedonian" + IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Canadian Multilingual Standard" + IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Chinese (Traditional) - Quick" + IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Chinese (Traditional) - Array" + IDS_KAZAKH_LAYOUT, "Kazakh" + IDS_UZBEK_CYRILLIC_LAYOUT, "Uzbek Cyrillic" + IDS_AZERI_CYRILLIC_LAYOUT, "Azeri Cyrillic" + IDS_TATAR_LAYOUT, "Tatar" + IDS_AZERI_LATIN_LAYOUT, "Azeri Latin" + IDS_VIETNAMESE_LAYOUT, "Vietnamese" + IDS_GEORGIAN_LAYOUT, "Georgian" + IDS_ARMENIAN_EASTERN_LAYOUT, "Armenian Eastern" + IDS_ARMENIAN_WESTERN_LAYOUT, "Armenian Western" + IDS_GREEK_POLYTONIC_LAYOUT, "Greek Polytonic" + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US English Table for IBM Arabic 238_L" + IDS_FARSI_LAYOUT, "Farsi" + IDS_GAELIC_LAYOUT, "Gaelic" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Portuguese (Brazilian ABNT2)" + IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Mongolian Cyrillic" + IDS_KYRGYZ_CYRILLIC_LAYOUT, "Kyrgyz Cyrillic" + IDS_URDU_LAYOUT, "Urdu" + IDS_SYRIAC_LAYOUT, "Syriac" + IDS_SYRIAC_PHONETIC_LAYOUT, "Syriac Phonetic" + IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi Phonetic" + IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" +END Propchange: trunk/reactos/dll/cpl/input/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/input/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/rsrc.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/rsrc.rc (original) +++ trunk/reactos/dll/cpl/input/rsrc.rc Sun Nov 18 19:49:29 2007 @@ -4,4 +4,5 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/win32/rasapi32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/lang/ru-RU.rc (added) +++ trunk/reactos/dll/win32/rasapi32/lang/ru-RU.rc Sun Nov 18 19:49:29 2007 @@ -1,0 +1,33 @@ +// Russian Language File Translated by towerr (tumans(a)nm.ru) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + 4097 "Ôàéë ñêðèïòà '%1' íåíàéäåí." + 4098 "%1(%2!d!) : íåïðàâèëüíîå îêîí÷àíèå ôàéëà" + 4099 "%1(%2!d!) : '%3' : ñèíòàêñè÷åññêàÿ îøèáêà" + 4100 "%1 : 'proc main' îòñóòñòâóåò äîñòóï" + 4101 "%1(%2!d!) : íåîáõîäèì ìàðêåð" + 4102 "%1(%2!d!) : íåîáõîäèì ñòðî÷íûé ïàðàìåòð" + 4103 "%1(%2!d!) : íåîáõîäèì ïàðàìåòð èíòåãðàë" + 4104 "%1(%2!d!) : '%3' : íåïðàâèëüíûé òèï" + 4105 "Íåñîîòâåòñòâèå ðàçìåðà ñêðèïòà ïðîöåññó." + 4106 "%1(%2!d!) : '%3' : êðèòè÷åññêàÿ âíóòðåííÿ îøèáêà." + 4107 "%1(%2!d!) : '%3' : íåïðàâèëüíûé ïàðàìåòð" + 4108 "%1(%2!d!) : '%3' : íåïðàâèëüíûé 'set ipaddr' ïàðàìåòð" + 4109 "%1(%2!d!) : '%3' : íåïðàâèëüíûé 'set port' ïàðàìåòð" + 4110 "%1(%2!d!) : '%3' : íåïðàâèëüíûé öèôðîâîé óêàçàòåëü" + 4111 "%1(%2!d!) : '%3' : íåïðàâèëüíûé 'set screen' ïàðàìåòð" + 4112 "%1(%2!d!) : '%3' : '(' íåîáõîäèì" + 4113 "%1(%2!d!) : '%3' : íåîáõîäèì òèï èíòåãðàë" + 4114 "%1(%2!d!) : '%3' : íåîáõîäèì òèï ñòðîêà" + 4115 "%1(%2!d!) : '%3' : íåîáõîäèì òèï áóëåí" + 4116 "%1(%2!d!) : '%3' : íåîáõîäèì òèï èíòåãðàë èëè ñòðîêà" + 4117 "%1(%2!d!) : '%3' : íåñîâïàäåíèå òèïîâ" + 4118 "%1(%2!d!) : '%3' : ìàðêåð óæå îïðåäåëåí" + 4119 "%1(%2!d!) : '%3' : ìàðêåð íå óñòàíîâëåí" + 4120 "%1(%2!d!) : '%3' : íåîáõîäèì òèï ìåòêè" + 4121 "%1(%2!d!) : äåëåíèå íà íîëü" + 4122 "%1(%2!d!) : '%3' : òèï äîëæåí áûòü èíòåãðàëîì, ñòðîêîé, èëè áóëåíîì" +END Propchange: trunk/reactos/dll/win32/rasapi32/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/rasapi32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/rsrc.rc (original) +++ trunk/reactos/dll/win32/rasapi32/rsrc.rc Sun Nov 18 19:49:29 2007 @@ -1,3 +1,4 @@ #include <windows.h> #include "lang/en-US.rc" +#include "lang/ru-RU.rc"

1 0

[fireball] 30551: - Fix paged pool overwrite in IopUnloadDriver, due to a typo in arithmetic. Thanks to Andrey Korotaev (unC0Rr) for the testcase. - Make error debug output DPRINT1 instead of DPRINT.
by fireball＠svn.reactos.org 18 Nov '07

18 Nov '07

Author: fireball Date: Sun Nov 18 19:12:45 2007 New Revision: 30551 URL: http://svn.reactos.org/svn/reactos?rev=30551&view=rev Log: - Fix paged pool overwrite in IopUnloadDriver, due to a typo in arithmetic. Thanks to Andrey Korotaev (unC0Rr) for the testcase. - Make error debug output DPRINT1 instead of DPRINT. 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 Sun Nov 18 19:12:45 2007 @@ -955,7 +955,7 @@ ObjectName.MaximumLength = ObjectName.Length + sizeof(WCHAR); ObjectName.Buffer = ExAllocatePool(PagedPool, ObjectName.MaximumLength); wcscpy(ObjectName.Buffer, L"\\Driver\\"); - memcpy(ObjectName.Buffer + 8, Start, (ObjectName.Length - 8) * sizeof(WCHAR)); + memcpy(ObjectName.Buffer + 8, Start, ObjectName.Length - 8 * sizeof(WCHAR)); ObjectName.Buffer[ObjectName.Length/sizeof(WCHAR)] = 0; /* @@ -967,7 +967,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT("Can't locate driver object for %wZ\n", ObjectName); + DPRINT1("Can't locate driver object for %wZ\n", ObjectName); return Status; } @@ -994,7 +994,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT("RtlQueryRegistryValues() failed (Status %x)\n", Status); + DPRINT1("RtlQueryRegistryValues() failed (Status %x)\n", Status); return Status; } @@ -1006,7 +1006,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT("IopNormalizeImagePath() failed (Status %x)\n", Status); + DPRINT1("IopNormalizeImagePath() failed (Status %x)\n", Status); return Status; }

1 0

[jimtabor] 30550: Fix dprint.
by jimtabor＠svn.reactos.org 18 Nov '07

18 Nov '07

Author: jimtabor Date: Sun Nov 18 18:52:31 2007 New Revision: 30550 URL: http://svn.reactos.org/svn/reactos?rev=30550&view=rev Log: Fix dprint. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Sun Nov 18 18:52:31 2007 @@ -157,8 +157,8 @@ } else { + PDC dc = DC_LockDc ( pDce->hDC ); DPRINT("FREE DCATTR!!!! NOT DCE_WINDOW_DC!!!!! hDC-> %x\n", pDce->hDC); - PDC dc = DC_LockDc ( pDce->hDC ); MmCopyFromCaller(&dc->Dc_Attr, dc->pDc_Attr, sizeof(DC_ATTR)); DC_UnlockDc( dc ); DC_FreeDcAttr(pDce->hDC); // Free the dcattr!

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
89
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 November 2007