Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[fireball] 29418: - Fix incorrect DPRINT.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 6 20:04:21 2007 New Revision: 29418 URL: http://svn.reactos.org/svn/reactos?rev=29418&view=rev Log: - Fix incorrect DPRINT. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Sat Oct 6 20:04:21 2007 @@ -556,7 +556,7 @@ ExFreePool(FullWindowStationName.Buffer); } - DPRINT("Window station successfully created (%wZ)\n", FullWindowStationName); + DPRINT("Window station successfully created (%wZ)\n", &FullWindowStationName); ExFreePool(FullWindowStationName.Buffer); return WindowStation; }

17 years

[fireball] 29417: - Fix build.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 6 18:35:39 2007 New Revision: 29417 URL: http://svn.reactos.org/svn/reactos?rev=29417&view=rev Log: - Fix build. Modified: trunk/reactos/dll/cpl/input/input.rbuild Modified: trunk/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rbuild (original) +++ trunk/reactos/dll/cpl/input/input.rbuild Sat Oct 6 18:35:39 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="input" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.cpl"> +<module name="input" type="win32dll" extension=".dll" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.dll"> <importlibrary definition="input.def" /> <include base="input">.</include> <define name="UNICODE" />

17 years

[fireball] 29416: Dmitry Chapyshev <lentind@yandex.ru> - Add some more dialogs to input.dll, and even some functionality, but it still needs a lot of work. - Add input.dll and systeminfo.exe to the bootcd

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 6 15:47:06 2007 New Revision: 29416 URL: http://svn.reactos.org/svn/reactos?rev=29416&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Add some more dialogs to input.dll, and even some functionality, but it still needs a lot of work. - Add input.dll and systeminfo.exe to the bootcd Added: trunk/reactos/dll/cpl/input/misc.c (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/advanced.c trunk/reactos/dll/cpl/input/changekeyseq.c trunk/reactos/dll/cpl/input/input.c trunk/reactos/dll/cpl/input/input.h trunk/reactos/dll/cpl/input/input.rbuild trunk/reactos/dll/cpl/input/input.rc trunk/reactos/dll/cpl/input/inputlangprop.c trunk/reactos/dll/cpl/input/keysettings.c trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/langbar.c trunk/reactos/dll/cpl/input/resource.h trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Oct 6 15:47:06 2007 @@ -113,6 +113,7 @@ dll\cpl\powercfg\powercfg.cpl 1 dll\cpl\sysdm\sysdm.cpl 1 dll\cpl\timedate\timedate.cpl 1 +dll\cpl\input\input.dll 1 dll\directx\dinput\dinput.dll 1 dll\directx\dinput8\dinput8.dll 1 @@ -482,6 +483,7 @@ modules\rosapps\roshttpd\roshttpd.exe 1 optional modules\rosapps\screenshot\screenshot.exe 1 optional modules\rosapps\sysutils\chkdsk\chkdsk.exe 1 optional +modules\rosapps\sysutils\systeminfo\systeminfo.exe 1 optional modules\rosapps\sysutils\chklib\chklib.exe 1 optional modules\rosapps\sysutils\ctm\ctm.exe 1 optional modules\rosapps\sysutils\kill\kill.exe 1 optional Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c (original) +++ trunk/reactos/dll/cpl/input/add.c Sat Oct 6 15:47:06 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/add.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/add.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ @@ -39,6 +39,93 @@ #include "resource.h" #include "input.h" +HWND hLanguageList; + +/*struct LangAndLayout +{ + TCHAR Lang; + TCHAR Layout; + TCHAR SubLayout; +} VarLang[133]; + +char *SubLang[133] = {} + +VOID CreateLangStruct(VOID) +{ + UINT Count; + TCHAR Layout[256]; + + for(Count = 0; Count < END_LAYOUT - BEGIN_LAYOUT; Count++) + { + LoadString(hApplet, + Count, + Layout, + sizeof(Layout) / sizeof(TCHAR)); + strcpy(VarLang[Count].Layout,Layout); + } +}*/ + +/* Language enumerate procedure */ +BOOL +CALLBACK +LanguagesEnumProc(LPTSTR lpLanguage) +{ + LCID Lcid; + TCHAR Lang[1024]; + int Index; + + Lcid = wcstoul(lpLanguage, NULL, 16); + + GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, Lang, sizeof(Lang)); + Index = (int) SendMessage(hLanguageList, + CB_ADDSTRING, + 0, + (LPARAM)Lang); + + SendMessage(hLanguageList, + CB_SETITEMDATA, + Index, + (LPARAM)Lcid); + + return TRUE; +} + +/* Enumerate all installed language identifiers */ +static +VOID +CreateLanguagesList(HWND hWnd) +{ + TCHAR LangSel[256]; + hLanguageList = hWnd; + EnumSystemLocales(LanguagesEnumProc, LCID_INSTALLED); + + LoadString(hApplet, + IDS_SELECTED_LANGUAGE, + LangSel, + sizeof(LangSel) / sizeof(TCHAR)); + + SendMessage(hLanguageList, + CB_SELECTSTRING, + (WPARAM) -1, + (LPARAM)LangSel); +} + +static +VOID +SelectCurrentLayout(HWND hWnd) +{ + TCHAR Layout[256]; + + LoadString(hApplet, + IDS_SELECTED_LAYOUT, + Layout, + sizeof(Layout) / sizeof(TCHAR)); + SendMessage(hWnd, + CB_SELECTSTRING, + (WPARAM) -1, + (LPARAM)Layout); +} + INT_PTR CALLBACK AddDlgProc(HWND hDlg, UINT message, @@ -51,15 +138,28 @@ { case WM_INITDIALOG: { - + CreateLanguagesList(GetDlgItem(hDlg, IDC_INPUT_LANGUAGE_COMBO)); + CreateKeyboardLayoutList(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO)); + SelectCurrentLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO)); } case WM_COMMAND: { - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) - { - EndDialog(hDlg,LOWORD(wParam)); - return TRUE; - } + switch (LOWORD(wParam)) + { + case IDC_INPUT_LANGUAGE_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + SelectCurrentLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO)); + } + break; + case IDOK: + + break; + case IDCANCEL: + EndDialog(hDlg,LOWORD(wParam)); + return TRUE; + break; + } } break; } Modified: trunk/reactos/dll/cpl/input/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/advanced.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/advanced.c (original) +++ trunk/reactos/dll/cpl/input/advanced.c Sat Oct 6 15:47:06 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/advanced.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/advanced.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ @@ -49,7 +49,17 @@ switch(uMsg) { case WM_INITDIALOG: - break; + + break; + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_SUPPORT_ADV_SERV_CHECKBOX: + case IDC_TURNOFF_ADV_TXTSERV_CHECKBOX: + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + break; } return FALSE; Modified: trunk/reactos/dll/cpl/input/changekeyseq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/changekeyseq… ============================================================================== --- trunk/reactos/dll/cpl/input/changekeyseq.c (original) +++ trunk/reactos/dll/cpl/input/changekeyseq.c Sat Oct 6 15:47:06 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/changekeyseq.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/changekeyseq.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ Modified: trunk/reactos/dll/cpl/input/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.c (original) +++ trunk/reactos/dll/cpl/input/input.c Sat Oct 6 15:47:06 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/input.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/input.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ Modified: trunk/reactos/dll/cpl/input/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.h (original) +++ trunk/reactos/dll/cpl/input/input.h Sat Oct 6 15:47:06 2007 @@ -12,6 +12,9 @@ } APPLET, *PAPPLET; extern HINSTANCE hApplet; + +#define BEGIN_LAYOUT 5000 +#define END_LAYOUT 5133 /* input.c */ VOID @@ -45,6 +48,10 @@ INT_PTR CALLBACK InputLangPropDlgProc(HWND hDlg,UINT message,WPARAM wParam,LPARAM lParam); +/* misc.c */ +VOID +CreateKeyboardLayoutList(HWND hWnd); + void ShowLastWin32Error(HWND hWndOwner); #endif /* __CPL_INPUT_H */ Modified: trunk/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rbuild (original) +++ trunk/reactos/dll/cpl/input/input.rbuild Sat Oct 6 15:47:06 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="input" type="win32dll" extension=".dll" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.dll"> +<module name="input" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.cpl"> <importlibrary definition="input.def" /> <include base="input">.</include> <define name="UNICODE" /> @@ -22,5 +22,6 @@ <file>add.c</file> <file>changekeyseq.c</file> <file>inputlangprop.c</file> + <file>misc.c</file> <file>input.rc</file> </module> Modified: trunk/reactos/dll/cpl/input/input.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rc (original) +++ trunk/reactos/dll/cpl/input/input.rc Sat Oct 6 15:47:06 2007 @@ -21,4 +21,6 @@ IDI_KEY_SHORT_ICO ICON "resources/keyboard-shortcuts.ico" IDI_INFO_ICO ICON "resources/information.ico" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #include "rsrc.rc" Modified: trunk/reactos/dll/cpl/input/inputlangprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/inputlangpro… ============================================================================== --- trunk/reactos/dll/cpl/input/inputlangprop.c (original) +++ trunk/reactos/dll/cpl/input/inputlangprop.c Sat Oct 6 15:47:06 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/inputlangprop.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/inputlangprop.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ @@ -39,6 +39,18 @@ #include "resource.h" #include "input.h" +static +VOID +SelectKeyboardLayout(HWND hWnd) +{ + TCHAR Layout[256]; + + SendMessage(hWnd, + CB_SELECTSTRING, + (WPARAM) -1, + (LPARAM)Layout); +} + INT_PTR CALLBACK InputLangPropDlgProc(HWND hDlg, UINT message, @@ -51,7 +63,8 @@ { case WM_INITDIALOG: { - + CreateKeyboardLayoutList(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_IME_COMBO)); + SelectKeyboardLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_IME_COMBO)); } case WM_COMMAND: { Modified: trunk/reactos/dll/cpl/input/keysettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/keysettings.… ============================================================================== --- trunk/reactos/dll/cpl/input/keysettings.c (original) +++ trunk/reactos/dll/cpl/input/keysettings.c Sat Oct 6 15:47:06 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/keysettings.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/keysettings.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc Sat Oct 6 15:47:06 2007 @@ -71,14 +71,14 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Eingabesprache:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL LTEXT "&Tastaturlayout/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 169, 68, 50, 14 END -IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78 +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 "Tastenkombination ändern" FONT 8, "MS Shell Dlg" @@ -110,8 +110,131 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 169, 53, 52, 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 "Add Input Language" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/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 "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&More Text Services:", 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 "Cancel", IDCANCEL, 199, 155, 50, 14 +} + +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 "Add Input Language" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/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 "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", 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 "Cancel", IDCANCEL, 199, 126, 50, 14 +} + +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 "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 209, 60 + AUTOCHECKBOX "&Switch input languages", 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 "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", 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 "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14 +} + +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 "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", 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 "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", 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 "&Grave Accent ( ` )", 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 "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +} + +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 "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", 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 "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", 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 "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +} + +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 "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", 1240, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "&Enable Key Sequence", 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 "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Key:", -1, 110, 37, 14, 10 + COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14 +} + 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_CPLSYSTEMNAME "Textdienste und Eingabesprachen" IDS_CPLSYSTEMDESCRIPTION "Ändert die Einstellungen der Texteingabe einer Sprache." IDS_US_LAYOUT, "US" Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/input/lang/en-US.rc Sat Oct 6 15:47:06 2007 @@ -71,14 +71,50 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Input language:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL LTEXT "&Keyboard layout/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 169, 68, 50, 14 END -IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78 +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 "Add Input Language" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/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 "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&More Text Services:", 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 "Cancel", IDCANCEL, 199, 155, 50, 14 +} + +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 "Add Input Language" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/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 "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", 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 "Cancel", IDCANCEL, 199, 126, 50, 14 +} + +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 "Change Key Sequence" FONT 8, "MS Shell Dlg" @@ -97,6 +133,89 @@ PUSHBUTTON "Cancel", 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 "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 209, 60 + AUTOCHECKBOX "&Switch input languages", 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 "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", 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 "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14 +} + +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 "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", 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 "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", 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 "&Grave Accent ( ` )", 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 "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +} + +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 "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", 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 "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", 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 "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +} + +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 "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", 1240, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "&Enable Key Sequence", 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 "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Key:", -1, 110, 37, 14, 10 + COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14 +} + 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 "Input language Properties" @@ -112,6 +231,11 @@ 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_CPLSYSTEMNAME "Text Services and Input Languages" IDS_CPLSYSTEMDESCRIPTION "Customizes settings for text input of languages." IDS_US_LAYOUT, "US" Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc Sat Oct 6 15:47:06 2007 @@ -71,14 +71,14 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Langue de sa&isie:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL LTEXT "Configuration du clavier/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 169, 68, 50, 14 END -IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78 +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 "Changer la séquence de touches" FONT 8, "MS Shell Dlg" @@ -110,10 +110,133 @@ PUSHBUTTON "Annuler", IDCANCEL, 169, 53, 52, 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 "Add Input Language" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/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 "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&More Text Services:", 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 "Cancel", IDCANCEL, 199, 155, 50, 14 +} + +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 "Add Input Language" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/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 "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", 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 "Cancel", IDCANCEL, 199, 126, 50, 14 +} + +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 "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 209, 60 + AUTOCHECKBOX "&Switch input languages", 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 "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", 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 "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14 +} + +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 "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", 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 "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", 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 "&Grave Accent ( ` )", 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 "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +} + +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 "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", 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 "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", 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 "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +} + +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 "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", 1240, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "&Enable Key Sequence", 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 "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Key:", -1, 110, 37, 14, 10 + COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14 +} + /* FIXME : To improve/complete */ /* FIXME : À améliorer/compléter */ 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_CPLSYSTEMNAME "Services texte et langue de saisie" IDS_CPLSYSTEMDESCRIPTION "Personnalise les paramètres pour la langue de saisie de texte." IDS_US_LAYOUT, "US" Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc Sat Oct 6 15:47:06 2007 @@ -79,14 +79,14 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Ìîâà ââîäó:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + 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, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + 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_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78 +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" @@ -118,8 +118,131 @@ PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 169, 53, 52, 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 "Add Input Language" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/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 "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10 + COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&More Text Services:", 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 "Cancel", IDCANCEL, 199, 155, 50, 14 +} + +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 "Add Input Language" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Keyboard layout/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 "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10 + COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTOCHECKBOX "&Speech:", 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 "Cancel", IDCANCEL, 199, 126, 50, 14 +} + +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 "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 209, 60 + AUTOCHECKBOX "&Switch input languages", 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 "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", 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 "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14 +} + +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 "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", 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 "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", 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 "&Grave Accent ( ` )", 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 "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +} + +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 "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 9, 5, 174, 110 + AUTOCHECKBOX "&Switch input languages", 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 "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP + AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP + AUTOCHECKBOX "S&witch keyboard layouts", 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 "Left A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14 +} + +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 "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", 1240, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "&Enable Key Sequence", 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 "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Key:", -1, 110, 37, 14, 10 + COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14 +} + 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_CPLSYSTEMNAME "Ìîâè òà ñëóæáè òåêñòîâîãî ââîäó" IDS_CPLSYSTEMDESCRIPTION "Íàëàøòîâóº ïàðàìåòðè äëÿ òåêñòîâîãî ââîäó." IDS_US_LAYOUT, "ÑØÀ" Modified: trunk/reactos/dll/cpl/input/langbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/langbar.c?re… ============================================================================== --- trunk/reactos/dll/cpl/input/langbar.c (original) +++ trunk/reactos/dll/cpl/input/langbar.c Sat Oct 6 15:47:06 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/langbar.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/langbar.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ Added: trunk/reactos/dll/cpl/input/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/misc.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/input/misc.c (added) +++ trunk/reactos/dll/cpl/input/misc.c Sat Oct 6 15:47:06 2007 @@ -1,0 +1,69 @@ +/* + * ReactOS + * Copyright (C) 2007 ReactOS Team + * + * 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. + * + * This 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * + * PROJECT: input.dll + * FILE: dll/win32/input/misc.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * UPDATE HISTORY: + * 06-09-2007 Created + */ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> + +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <tchar.h> +#include <process.h> + +#include "resource.h" +#include "input.h" + +VOID +CreateKeyboardLayoutList(HWND hWnd) +{ + TCHAR Layout[256]; + int Index; + UINT loIndex; + + for ( loIndex = BEGIN_LAYOUT; loIndex <= END_LAYOUT; loIndex++ ) + { + LoadString(hApplet, + loIndex, + Layout, + sizeof(Layout) / sizeof(TCHAR)); + if (strlen((char*)Layout) > 0) + { + Index = (int) SendMessage(hWnd, + CB_INSERTSTRING, + 0, + (LPARAM)Layout); + SendMessage(hWnd, + CB_SETITEMDATA, + Index, + (LPARAM)loIndex); + } + } +} + +/* EOF */ Propchange: trunk/reactos/dll/cpl/input/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/input/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/input/resource.h (original) +++ trunk/reactos/dll/cpl/input/resource.h Sat Oct 6 15:47:06 2007 @@ -18,12 +18,18 @@ /* IDD */ #define IDD_PROPPAGESETTINGS 500 -#define IDD_PROPPAGEADVANCED 501 -#define IDD_LANGBAR 502 -#define IDD_KEYSETTINGS 503 -#define IDD_ADD 504 -#define IDD_CHANGE_KEY_SEQ 505 -#define IDD_INPUT_LANG_PROP 506 +#define IDD_ADD3 501 +#define IDD_INPUT_LANG_PROP 502 +#define IDD_CHANGE_KEY_SEQ 503 +#define IDD_CHANGE_KEY_SEQ4 504 +#define IDD_CHANGE_KEY_SEQ5 505 +#define IDD_CHANGE_KEY_SEQ2 506 +#define IDD_ADD 507 +#define IDD_CHANGE_KEY_SEQ3 508 +#define IDD_ADD2 509 +#define IDD_KEYSETTINGS 510 +#define IDD_LANGBAR 511 +#define IDD_PROPPAGEADVANCED 512 /* IDC */ #define IDC_DEFAULT_INPUT_LANG 150 @@ -52,6 +58,23 @@ #define IDC_ALT_CHECKBOX 173 #define IDC_CKEY_COMBOBOX 174 #define IDC_KEYBOARD_LAYOUT_IME_COMBO 175 +#define IDC_SWITCH_INPUT_LANG_CHECKBOX 176 +#define IDC_INLANG_CTRL_RADIOBTN 177 +#define IDC_INLANG_LEFTALT_RADIOBTN 178 +#define IDC_SWITCH_KEYBOARD_LO_CHECKBOX 179 +#define IDC_LAYOUT_CTRL_RADIOBTN 180 +#define IDC_LAYOUT_LEFTALT_RADIOBTN 181 +#define IDC_INPUT_LANG_COMBO 182 +#define IDC_KEYBOARD_LO_CHECKBOX 183 +#define IDC_KEYBOARD_LO_COMBO 184 +#define IDC_HANDWRITING_REC_CHECKBOX 185 +#define IDC_HANDWRITING_REC_COMBO 186 +#define IDC_SPEECH_CHECKBOX 187 +#define IDC_SPEECH_COMBO 188 +#define IDC_MORE_TEXT_SERV_CHECKBOX 189 +#define IDC_MORE_TEXT_SERV_COMBO 190 +#define IDC_CKS_BUTTON 191 +#define IDC_GRAVE_ACCENT_RADIOBTN 192 /* IDS */ #define IDS_CPLSYSTEMNAME 1 @@ -188,6 +211,9 @@ #define IDS_DIVEHI_PHONETIC_LAYOUT 5132 #define IDS_DIVEHI_TYPEWRITER_LAYOUT 5133 +#define IDS_SELECTED_LAYOUT 6000 +#define IDS_SELECTED_LANGUAGE 6001 + #endif /* __CPL_RESOURCE_H */ /* EOF */ Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c (original) +++ trunk/reactos/dll/cpl/input/settings.c Sat Oct 6 15:47:06 2007 @@ -18,10 +18,10 @@ */ /* * - * PROJECT: input.dll - * FILE: dll/win32/input/settings.c - * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * PROJECT: input.dll + * FILE: dll/win32/input/settings.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: * 06-09-2007 Created */ @@ -39,6 +39,58 @@ #include "resource.h" #include "input.h" +#define BUFSIZE 80 + +static +BOOL +CreateDefaultLangList(HWND hWnd) +{ + HKEY hKey; + char szPreload[BUFSIZE],szCount[BUFSIZE],Lang[BUFSIZE]; + DWORD dwBufLen = BUFSIZE, dwBufCLen = BUFSIZE, cValues; + LONG lRet; + int Count; + LCID Lcid; + + if(RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) + { + return FALSE; + } + RegQueryInfoKey(hKey,NULL,NULL,NULL,NULL,NULL,NULL,&cValues,NULL,NULL,NULL,NULL); + + if (cValues) + { + for (Count = 0; Count < cValues; Count++) + { + szCount[0] = '\0'; + lRet = RegEnumValue(hKey,Count,(LPTSTR)szCount,&dwBufCLen,NULL,NULL,NULL,NULL); + + sprintf(szCount,"%d",Count + 1); + RegQueryValueEx(hKey,(LPTSTR)szCount,NULL,NULL,(LPBYTE)szPreload,&dwBufLen); + + Lcid = wcstoul((LPTSTR)szPreload, NULL, 16); + GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, (LPTSTR)Lang, sizeof(Lang)); + + SendMessage(hWnd, + CB_INSERTSTRING, + 0, + (LPARAM)Lang); + if (Count == 0) + { + SendMessage(hWnd, + CB_SELECTSTRING, + (WPARAM) -1, + (LPARAM)Lang); + } + } + + } + + RegCloseKey(hKey); + + return TRUE; +} + /* Property page dialog callback */ INT_PTR CALLBACK SettingPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) @@ -47,8 +99,8 @@ switch (uMsg) { case WM_INITDIALOG: - - break; + CreateDefaultLangList(GetDlgItem(hwndDlg, IDC_DEFAULT_INPUT_LANG)); + break; case WM_COMMAND: switch (LOWORD(wParam)) @@ -77,6 +129,12 @@ hwndDlg, InputLangPropDlgProc); break; + case IDC_DEFAULT_INPUT_LANG: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; } break; }

17 years

[fireball] 29415: Dmitry Chapyshev <lentind@yandex.ru> - Fix a typo in the russian translation of taskmgr. - Improve explorer icons (as usual, remove 4bits, add 16bits, and very slightly edit). - Add some missing icons to setupapi.dll.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 6 15:04:31 2007 New Revision: 29415 URL: http://svn.reactos.org/svn/reactos?rev=29415&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Fix a typo in the russian translation of taskmgr. - Improve explorer icons (as usual, remove 4bits, add 16bits, and very slightly edit). - Add some missing icons to setupapi.dll. Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/shell/explorer/res/config.ico trunk/reactos/base/shell/explorer/res/control-panel.ico trunk/reactos/base/shell/explorer/res/desktop-settings.ico trunk/reactos/base/shell/explorer/res/explorer.ico trunk/reactos/base/shell/explorer/res/favorites.ico trunk/reactos/base/shell/explorer/res/info.ico trunk/reactos/base/shell/explorer/res/logoff.ico trunk/reactos/base/shell/explorer/res/network.ico trunk/reactos/base/shell/explorer/res/recent-documents.ico trunk/reactos/base/shell/explorer/res/shutdown.ico trunk/reactos/dll/win32/setupapi/res/icons/11.ico trunk/reactos/dll/win32/setupapi/res/icons/159.ico trunk/reactos/dll/win32/setupapi/res/icons/18.ico trunk/reactos/dll/win32/setupapi/res/icons/26.ico trunk/reactos/dll/win32/setupapi/res/icons/43.ico trunk/reactos/dll/win32/setupapi/res/icons/6.ico trunk/reactos/dll/win32/setupapi/res/icons/8.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 Oct 6 15:04:31 2007 @@ -662,7 +662,7 @@ IDS_MSG_TRAYICONCPUUSAGE "Èñïîëüçîâàíèå ÖÏ: %d%%" IDS_STATUS_MEMUSAGE "Èñïîëüçîâàíèå ïàìÿòè: %dK / %dK" IDS_STATUS_CPUUSAGE "Èñïîëüçîâàíèå ÖÏ: %3d%%" - IDS_STATUS_PROCESSES "Ïðîöåññ: %d" + IDS_STATUS_PROCESSES "Ïðîöåññîâ: %d" IDS_Not_Responding "Íå îòâå÷àåò" IDS_Running "Ðàáîòàåò" END Modified: trunk/reactos/base/shell/explorer/res/config.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/co… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/control-panel.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/co… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/desktop-settings.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/de… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/explorer.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/ex… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/favorites.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/fa… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/info.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/in… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/logoff.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/lo… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/network.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/ne… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/recent-documents.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/re… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/shutdown.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/sh… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/icons/11.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/icons/159.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/icons/18.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/icons/26.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/icons/43.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/icons/6.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/icons/8.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available.

17 years

[fireball] 29414: Dmitry Chapyshev <lentind@yandex.ru> - Update the icons for sysdm and netid.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 6 14:55:13 2007 New Revision: 29414 URL: http://svn.reactos.org/svn/reactos?rev=29414&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Update the icons for sysdm and netid. Modified: trunk/reactos/dll/cpl/sysdm/resources/devmgr.ico trunk/reactos/dll/win32/netid/res/netid.ico Modified: trunk/reactos/dll/cpl/sysdm/resources/devmgr.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resources/de… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/netid/res/netid.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/res/netid.… ============================================================================== Binary files - no diff available.

17 years

[fireball] 29413: Dmitry Chapyshev <lentind@yandex.ru> - Add russian translation to clb. - Regedit's icons: remove 4bit icons, add 16bit icons.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 6 14:53:22 2007 New Revision: 29413 URL: http://svn.reactos.org/svn/reactos?rev=29413&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Add russian translation to clb. - Regedit's icons: remove 4bit icons, add 16bit icons. Added: trunk/reactos/base/applications/regedit/clb/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/regedit/clb/rsrc.rc trunk/reactos/base/applications/regedit/res/folder.ico trunk/reactos/base/applications/regedit/res/folderopen.ico trunk/reactos/base/applications/regedit/res/regedit.ico Added: trunk/reactos/base/applications/regedit/clb/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/regedit/clb/lang/ru-RU.rc Sat Oct 6 14:53:22 2007 @@ -1,0 +1,27 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_COLUMNLISTBOXSTYLES DIALOGEX 0, 0, 227, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ñòèëè Column List Box" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Ñòèëè Column List Box", -1, 6, 7, 158, 71 + CHECKBOX "Ñ&òàíäàðòíàÿ", 1710, 10, 20, 42, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Îáðàìëåíèå", 1713, 10, 30, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ñîðòèðîâêà", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Óâåäîìëåíèå", 1706, 10, 50, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Âåðò. ïîëîñà ïðîêðóòêè", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ìíîæåñòâåííûé âûáîð", -1, 79, 20, 72, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "&Ðàñøèðåííûé âûáîð", -1, 79, 30, 77, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "&Âñïëûâàþùèå ïîäñêàçêè", 1714, 79, 40, 68, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Springy Columns", 1715, 79, 50, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + GROUPBOX "Îñíîâíîé ñòèëü", -1, 6, 80, 158, 34 + CHECKBOX "Â&èäèìûé", 1701, 10, 92, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Âûêëþ÷åíî", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ãðóïïèðîâêà", 1703, 79, 92, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Tab Stop", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 37, 125, 40, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Îòìåíà", IDCANCEL, 93, 125, 40, 14, BS_PUSHBUTTON | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ðàçðåøèòü ïîëîñó ïðîêðóòêè", 1708, 79, 60, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +END + Propchange: trunk/reactos/base/applications/regedit/clb/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/regedit/clb/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/rsrc.rc (original) +++ trunk/reactos/base/applications/regedit/clb/rsrc.rc Sat Oct 6 14:53:22 2007 @@ -38,5 +38,6 @@ #include "lang/nb-NO.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" +#include "lang/ru-RU.rc" Modified: trunk/reactos/base/applications/regedit/res/folder.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/regedit/res/folderopen.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/regedit/res/regedit.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== Binary files - no diff available.

17 years

[fireball] 29412: Dmitry Chapyshev <lentind@yandex.ru> - Add a temporary icon (should be changed to a better one), so that it's displayed in the taskbar and window title.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 6 14:50:51 2007 New Revision: 29412 URL: http://svn.reactos.org/svn/reactos?rev=29412&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Add a temporary icon (should be changed to a better one), so that it's displayed in the taskbar and window title. Added: trunk/reactos/base/applications/msconfig/res/ trunk/reactos/base/applications/msconfig/res/msconfig.ico (with props) Modified: trunk/reactos/base/applications/msconfig/msconfig.c trunk/reactos/base/applications/msconfig/msconfig.rc trunk/reactos/base/applications/msconfig/resource.h Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.c (original) +++ trunk/reactos/base/applications/msconfig/msconfig.c Sat Oct 6 14:50:51 2007 @@ -141,11 +141,22 @@ { int idctrl; LPNMHDR pnmh; + static HICON hIcon; switch (message) { case WM_INITDIALOG: hMainWnd = hDlg; + hIcon = LoadImage(GetModuleHandle(NULL), + MAKEINTRESOURCE(IDI_APPICON), + IMAGE_ICON, + 16, + 16, + 0); + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); return OnCreate(hDlg); case WM_COMMAND: Modified: trunk/reactos/base/applications/msconfig/msconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.rc (original) +++ trunk/reactos/base/applications/msconfig/msconfig.rc Sat Oct 6 14:50:51 2007 @@ -12,6 +12,8 @@ #define REACTOS_STR_ORIGINAL_FILENAME "msconfig.exe\0" #include <reactos/version.rc> +IDI_APPICON ICON "res/msconfig.ico" #include "rsrc.rc" + Added: trunk/reactos/base/applications/msconfig/res/msconfig.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/msconfig/res/msconfig.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/applications/msconfig/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/resource.h (original) +++ trunk/reactos/base/applications/msconfig/resource.h Sat Oct 6 14:50:51 2007 @@ -111,4 +111,6 @@ #define IDS_MSCONFIG 3000 +#define IDI_APPICON 3001 + /* EOF */

17 years

[fireball] 29411: Dmitry Chapyshev <lentind@yandex.ru> - Fix a typo in russian translation of intl.cpl

by fireball＠svn.reactos.org

Author: fireball Date: Sat Oct 6 14:46:42 2007 New Revision: 29411 URL: http://svn.reactos.org/svn/reactos?rev=29411&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Fix a typo in russian translation of intl.cpl Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/ru-RU.rc Sat Oct 6 14:46:42 2007 @@ -89,7 +89,7 @@ IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Äåíåæíàÿ åäåíèöà" +CAPTION "Äåíåæíàÿ åäèíèöà" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Îáðàçöû", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE

17 years

[arty] 29410: Added to trunk.

by arty＠svn.reactos.org

Author: arty Date: Sat Oct 6 12:34:33 2007 New Revision: 29410 URL: http://svn.reactos.org/svn/reactos?rev=29410&view=rev Log: Added to trunk. Added: trunk/reactos/lib/ppcmmu/ trunk/reactos/lib/ppcmmu/dummy.c trunk/reactos/lib/ppcmmu/ldscript trunk/reactos/lib/ppcmmu/mmuobject.c trunk/reactos/lib/ppcmmu/mmuobject.h trunk/reactos/lib/ppcmmu/mmutest.c trunk/reactos/lib/ppcmmu/mmuutil.c trunk/reactos/lib/ppcmmu/ppcmmu.mak trunk/reactos/lib/ppcmmu/ppcmmu.rbuild Added: trunk/reactos/lib/ppcmmu/dummy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/dummy.c?rev=294… ============================================================================== (empty) Added: trunk/reactos/lib/ppcmmu/ldscript URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/ldscript?rev=29… ============================================================================== --- trunk/reactos/lib/ppcmmu/ldscript (added) +++ trunk/reactos/lib/ppcmmu/ldscript Sat Oct 6 12:34:33 2007 @@ -1,0 +1,8 @@ +OUTPUT_FORMAT(elf32-powerpc); + +SECTIONS +{ + .text : { *(.text) } + .data : { *(.data) *(.rodata) } + .bss : { *(.sbss) *(.bss) *(COMMON) } +} Added: trunk/reactos/lib/ppcmmu/mmuobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/mmuobject.c?rev… ============================================================================== --- trunk/reactos/lib/ppcmmu/mmuobject.c (added) +++ trunk/reactos/lib/ppcmmu/mmuobject.c Sat Oct 6 12:34:33 2007 @@ -1,0 +1,661 @@ +#include <stdarg.h> +#include "ppcmmu/mmu.h" +#include "ppcmmu/mmuutil.h" +#include "mmuobject.h" +#include "helper.h" + +typedef unsigned long ULONG; + +/* + +The MMU Object: +0x00300 -- Data miss +0x00400 -- Instruction miss +0x10000 -- Entry point +... Code +0x20000 -- Physical map (PTE + Process Ptr + Address : 16 bytes) + +4096 / 16 bytes = 256 entries per page +256 pages = 1Megabyte = 1 page table page + +Setup by freeldr and used to build the kernel map, then used by the kernel + +Calling: + +r3 -- Action +r4 .. r6 -- Args + +Actions: +00 Init +01 Map pages +02 erase pages +03 set segment vsid +04 page miss callback +05 inquire page +06 unit test +07 alloc page +08 set memory size +09 get first usable page +10 alloc vsid +11 revoke vsid +*/ + +MmuPageCallback callback; +typedef struct _MmuFreePage { + int page; + struct _MmuFreePage *next; +} MmuFreePage; +typedef struct _MmuFreeTree { + struct _MmuFreeTree *next; +} MmuFreeTree; +typedef struct _MmuVsidTree { + ppc_map_t *leaves[256]; +} MmuVsidTree; +typedef struct _MmuVsidInfo { + int vsid; + struct _MmuVsidInfo *next; + MmuVsidTree *tree[256]; +} MmuVsidInfo; +MmuFreePage *FreeList; +// Pages are allocated one by one until NextPage == RamSize >> PPC_PAGE_SHIFT +// Then we take only from the free list +int Clock = 0, TreeAlloc = 0; +paddr_t RamSize, FirstUsablePage, NextPage; +MmuVsidTree *NextTreePage = 0; +MmuFreeTree *FreeTree; +MmuVsidInfo *Segs[16], *VsidHead = 0; + +extern void fmtout(const char *fmt, ...); +int ptegreload(ppc_trap_frame_t *frame, vaddr_t addr); + +__asm__(".text\n\t" + ".globl mmumain\n\t" + ".globl _mmumain\n\t" + ".globl oldstack\n\t" + "mmumain:\n\t" + "lis 7,oldstack@ha\n\t" + "addi 7,7,oldstack@l\n\t" + "mflr 0\n\t" + "stw 1,0(7)\n\t" + "lis 1,2\n\t" + "subi 1,1,16\n\t" + "stw 0,0(1)\n\t" + "bl _mmumain\n\t" + "lis 7,oldstack@ha\n\t" + "addi 7,7,oldstack@l\n\t" + "lwz 0,0(1)\n\t" + "lwz 1,0(7)\n\t" + "mtlr 0\n\t" + "blr\n" + "oldstack:\n\t" + ".long 0\n\t"); + +__asm__(".text\n\t" + ".globl data_miss_finish_start\n" + "data_miss_finish_start:\n\t" + "lwz 2,8(1)\n\t" + "lwz 3,12(1)\n\t" + "lwz 4,16(1)\n\t" + "lwz 5,20(1)\n\t" + "lwz 6,24(1)\n\t" + "lwz 7,28(1)\n\t" + "lwz 8,32(1)\n\t" + "lwz 9,36(1)\n\t" + "lwz 10,40(1)\n\t" + "lwz 11,44(1)\n\t" + "lwz 12,48(1)\n\t" + "lwz 13,52(1)\n\t" + "lwz 14,56(1)\n\t" + "lwz 15,60(1)\n\t" + "lwz 16,64(1)\n\t" + "lwz 17,68(1)\n\t" + "lwz 18,72(1)\n\t" + "lwz 19,76(1)\n\t" + "lwz 20,80(1)\n\t" + "lwz 21,84(1)\n\t" + "lwz 22,88(1)\n\t" + "lwz 23,92(1)\n\t" + "lwz 24,96(1)\n\t" + "lwz 25,100(1)\n\t" + "lwz 26,104(1)\n\t" + "lwz 27,108(1)\n\t" + "lwz 28,112(1)\n\t" + "lwz 29,116(1)\n\t" + "lwz 30,120(1)\n\t" + "lwz 31,124(1)\n\t" + "lwz 0,128(1)\n\t" + "mtlr 0\n\t" + "lwz 0,132(1)\n\t" + "mtcr 0\n\t" + "lwz 0,136(1)\n\t" + "mtctr 0\n\t" + "lwz 0,0(1)\n\t" + "mfsprg1 1\n\t" + "rfi\n\t"); + +/* + * Trap frame: + * r0 .. r32 + * lr, ctr, srr0, srr1, dsisr + */ +__asm__(".text\n\t" + ".globl data_miss_start\n\t" + ".globl data_miss_end\n\t" + "data_miss_start:\n\t" + "mtsprg1 1\n\t" + "lis 1,2\n\t" + "subi 1,1,256\n\t" + "stw 0,0(1)\n\t" + "mfsprg1 0\n\t" + "stw 0,4(1)\n\t" + "stw 2,8(1)\n\t" + "stw 3,12(1)\n\t" + "stw 4,16(1)\n\t" + "stw 5,20(1)\n\t" + "stw 6,24(1)\n\t" + "stw 7,28(1)\n\t" + "stw 8,32(1)\n\t" + "stw 9,36(1)\n\t" + "stw 10,40(1)\n\t" + "stw 11,44(1)\n\t" + "stw 12,48(1)\n\t" + "stw 13,52(1)\n\t" + "stw 14,56(1)\n\t" + "stw 15,60(1)\n\t" + "stw 16,64(1)\n\t" + "stw 17,68(1)\n\t" + "stw 18,72(1)\n\t" + "stw 19,76(1)\n\t" + "stw 20,80(1)\n\t" + "stw 21,84(1)\n\t" + "stw 22,88(1)\n\t" + "stw 23,92(1)\n\t" + "stw 24,96(1)\n\t" + "stw 25,100(1)\n\t" + "stw 26,104(1)\n\t" + "stw 27,108(1)\n\t" + "stw 28,112(1)\n\t" + "stw 29,116(1)\n\t" + "stw 30,120(1)\n\t" + "stw 31,124(1)\n\t" + "mflr 0\n\t" + "stw 0,128(1)\n\t" + "mfcr 0\n\t" + "stw 0,132(1)\n\t" + "mfctr 0\n\t" + "stw 0,136(1)\n\t" + "mfsrr0 0\n\t" + "stw 0,140(1)\n\t" + "mfsrr1 0\n\t" + "stw 0,144(1)\n\t" + "mfdsisr 0\n\t" + "stw 0,148(1)\n\t" + "mfdar 0\n\t" + "stw 0,152(1)\n\t" + "mfxer 0\n\t" + "stw 0,156(1)\n\t" + "li 3,100\n\t" + "mr 4,1\n\t" + "lis 5,data_miss_finish_start@ha\n\t" + "addi 5,5,data_miss_finish_start@l\n\t" + "mtlr 5\n\t" + "lis 5,_mmumain@ha\n\t" + "addi 5,5,_mmumain@l\n\t" + "mtctr 5\n\t" + "bctr\n" + "data_miss_end:\n\t" + ".space 4"); + +extern int data_miss_end, data_miss_start; + +int _mmumain(int action, void *arg1, void *arg2, void *arg3) +{ + void (*fun)(void *) = arg1; + ppc_trap_frame_t *trap_frame = arg1; + int ret = 0; + + switch(action) + { + case 0: + initme(); + break; + case 1: + ret = mmuaddpage(arg1, (int)arg2); + break; + case 2: + mmudelpage(arg1, (int)arg2); + break; + case 3: + mmusetvsid((int)arg1, (int)arg2, (int)arg3); + break; + case 4: + /* Miss callback = arg1 */ + ret = (int)callback; + callback = arg1; + break; + case 5: + mmugetpage(arg1, (int)arg2); + break; + case 6: + ret = mmunitest(); + break; + case 7: + __asm__("mfmsr 3\n\t" + "ori 3,3,0x30\n\t" + "mtmsr 3\n\t" + "mtsdr1 %0\n\t" + "mr 0,%2\n\t" + "mtctr 0\n\t" + "mr 3,%1\n\t" + "bctrl\n\t" + : : "r" (HTABORG), "r" (arg2), "r" (fun)); + /* BYE ! */ + break; + case 8: + mmusetramsize((paddr_t)arg1); + break; + case 9: + return FirstUsablePage; + case 10: + mmuallocvsid((int)arg1, (int)arg2); + break; + case 11: + mmufreevsid((int)arg1, (int)arg2); + break; + case 100: + if(!ptegreload(trap_frame, trap_frame->dar)) + { + __asm__("mfmsr 3\n\tori 3,3,0x30\n\tmtmsr 3\n\t"); + callback(0,arg1); + } + break; + case 101: + if(!ptegreload(trap_frame, trap_frame->srr0)) + { + __asm__("mfmsr 3\n\tori 3,3,0x30\n\tmtmsr 3\n\t"); + callback(1,arg1); + } + break; + default: + while(1); + } + + return ret; +} + +void outchar(char c) +{ + SetPhysByte(0x800003f8, c); +} + +void outstr(const char *str) +{ + while(*str) outchar(*str); +} + +void outdig(int dig) +{ + if(dig < 10) outchar(dig + '0'); + else outchar(dig - 10 + 'A'); +} + +void outnum(unsigned long num) +{ + int i; + for( i = 0; i < 8; i++ ) + { + outdig(num >> 28); + num <<= 4; + } +} + +void fmtout(const char *str, ...) +{ + va_list ap; + va_start(ap, str); + while(*str) + { + if(*str == '%') + { + if(str[1] == '%') + { + outchar('%'); + } + else if(str[1] == 's') + { + outstr(va_arg(ap, const char *)); + } + else + { + outnum(va_arg(ap, int)); + } + str++; + } + else + { + outchar(*str); + } + str++; + } + va_end(ap); +} + +void mmusetramsize(paddr_t ramsize) +{ + ppc_map_t *last_map = &PpcPageTable[PPC_PAGE_NUMBER(ramsize)]; + if(!RamSize) + { + RamSize = ramsize; + FirstUsablePage = (paddr_t)last_map; + NextPage = PPC_PAGE_NUMBER(FirstUsablePage); + } +} + +void initme() +{ + int i; + int *target, *start; + + for(i = 0; i < HTABSIZ / sizeof(int); i++) + { + ((int *)HTABORG)[i] = 0; + } + + for(target = (int *)0x300, start = &data_miss_start; start < &data_miss_end; start++, target++) + { + SetPhys((paddr_t)target, *start); + } + + (&data_miss_start)[50]++; + + for(target = (int *)0x400, start = &data_miss_start; start < &data_miss_end; start++, target++) + { + SetPhys((paddr_t)target, *start); + } +} + +ppc_map_t *allocpage() +{ + MmuFreePage *FreePage = 0; + + if(NextPage < PPC_PAGE_NUMBER(RamSize)) { + return &PpcPageTable[NextPage++]; + } else { + FreePage = FreeList; + FreeList = FreeList->next; + return ((ppc_map_t*)FreePage); + } +} + +void freepage(ppc_map_t *PagePtr) +{ + MmuFreePage *FreePage = (MmuFreePage*)PagePtr; + PagePtr->proc = PagePtr->addr = 0; + FreePage->next = FreeList; + FreeList = FreePage; +} + +MmuVsidTree *allocvsidtree() +{ + if(FreeTree) + { + MmuVsidTree *result = (MmuVsidTree*)FreeTree; + FreeTree = FreeTree->next; + return result; + } + else if(TreeAlloc >= 3 || !NextTreePage) + { + ppc_map_t *map = allocpage(); + NextTreePage = (MmuVsidTree*)PPC_PAGE_ADDR((map - PpcPageTable)); + TreeAlloc = 1; + return NextTreePage; + } + else + { + return &NextTreePage[TreeAlloc++]; + } +} + +void freevsidtree(MmuVsidTree *tree) +{ + int i; + for(i = 0; i < 256; i++) + if(tree->leaves[i]) + freepage(tree->leaves[i]); + MmuFreeTree *NextFreeTree = (MmuFreeTree *)tree; + NextFreeTree->next = FreeTree; + FreeTree = NextFreeTree; +} + +void *allocvsid(int vsid) +{ + ppc_map_t *map = allocpage(); + MmuVsidInfo *info; + if(!map) return 0; + map->pte.pteh = map->pte.ptel = 0; + info = (MmuVsidInfo*)PPC_PAGE_ADDR((map - PpcPageTable)); + info->vsid = vsid; + info->next = VsidHead; + VsidHead = info; + return info; +} + +void mmuallocvsid(int vsid, int mask) +{ + int i; + for(i = 0; i < 16; i++) + { + if(mask & (1 << i)) + allocvsid((vsid << 4) + i); + } +} + +MmuVsidInfo *findvsid(int vsid) +{ + MmuVsidInfo *info; + for(info = VsidHead; info; info = info->next) + { + if(info->vsid == vsid) return info; + } + return 0; +} + +void freevsid(int vsid) +{ + int i; + MmuVsidInfo *info = findvsid(vsid); + if(!info) return; + ppc_map_t *map = &PpcPageTable[PPC_PAGE_NUMBER((paddr_t)info)]; + for(i = 0; i < 256; i++) + { + if(info->tree[i]) + freevsidtree(info->tree[i]); + } + freepage(map); +} + +void mmufreevsid(int vsid, int mask) +{ + int i; + for(i = 0; i < 16; i++) + { + if(mask & (1 << i)) + allocvsid((vsid << 4) + i); + } +} + +int mmuaddpage(ppc_map_info_t *info, int count) +{ + int i, iva = 0, vsid, phys, virt; + int ptehi; + int ptelo, vsid_table_hi, vsid_table_lo; + ppc_map_t *PagePtr; + MmuVsidInfo *VsidInfo; + MmuVsidTree *VsidTree; + + for(i = 0; i < count; i++) + { + virt = info[i].addr; + vsid = ((info[i].addr >> 28) & 15) | (info[i].proc << 4); + VsidInfo = findvsid(vsid); + + if(!VsidInfo) return -1; + + ptehi = (1 << 31) | (vsid << 7) | ((virt >> 22) & 0x3f); + + if(info[i].phys) { + PagePtr = &PpcPageTable[PPC_PAGE_NUMBER(info[i].phys)]; + } else { + PagePtr = allocpage(); + if(!PagePtr) + { + return 0; + } + } + + phys = PPC_PAGE_ADDR((PagePtr - PpcPageTable)); + ptelo = phys & ~PPC_PAGE_MASK; + + /* Update page data */ + PagePtr->pte.pteh = ptehi; + PagePtr->pte.ptel = ptelo; + PagePtr->proc = info[i].proc; + PagePtr->addr = virt; + + vsid_table_hi = virt >> 20 & 255; + vsid_table_lo = virt >> 12 & 255; + + if(!VsidInfo->tree[vsid_table_hi]) + VsidInfo->tree[vsid_table_hi] = allocvsidtree(); + VsidTree = VsidInfo->tree[vsid_table_hi]; + if(!VsidTree) return 0; + VsidTree->leaves[vsid_table_lo] = PagePtr; + + __asm__("tlbie %0\n\tsync\n\tisync" : : "r" (iva)); + } + return 1; +} + +ppc_pteg_t *PtegFromPage(ppc_map_t *map, int hfun) +{ + if(!map->proc && !map->addr) return 0; + return &PpcHashedPTE[PtegNumber(map->addr, hfun)]; +} + +int PageMatch(vaddr_t addr, ppc_pte_t pte) +{ + int vsid_pte = (pte.pteh >> 7) & 15, api_pte = pte.pteh & 63; + return + (((addr >> 28) & 15) == vsid_pte) && + (((addr >> 22) & 63) == api_pte); +} + +ppc_map_t *mmuvirtmap(vaddr_t addr, int vsid) +{ + int seg = (addr >> 28) & 15; + MmuVsidInfo *seginfo = Segs[seg]; + MmuVsidTree *segtree = 0; + if(!seginfo) return 0; + segtree = seginfo->tree[(addr >> 20) & 255]; + if(!segtree) return 0; + return segtree->leaves[(addr >> 12) & 255]; +} + +void mmudelpage(ppc_map_info_t *info, int count) +{ + int i, j, k, ipa; + ppc_map_t *PagePtr; + ppc_pteg_t *PageEntry; + ppc_pte_t ZeroPte = { 0 }; + + for(i = 0; i < count; i++) + { + if (info[i].phys) + { + ipa = info[i].phys; + PagePtr = &PpcPageTable[ipa]; + info[i].proc = PagePtr->proc; + info[i].addr = PagePtr->addr; + } + else + { + PagePtr = mmuvirtmap(info[i].proc, info[i].addr); + ipa = PPC_PAGE_ADDR(PagePtr - PpcPageTable); + } + + for(j = 0; j < 2; j++) + { + PageEntry = PtegFromPage(PagePtr, j); + for(k = 0; k < 8; k++) + { + if(PageMatch(ipa, PageEntry->block[k])) + { + if(PageEntry->block[k].ptel & 0x100) + info[i].flags |= MMU_PAGE_DIRTY; + PageEntry->block[k] = ZeroPte; + } + } + } + freepage(PagePtr); + __asm__("tlbie %0\n\tsync\n\tisync" : : "r" (info[i].addr)); + } +} + +void mmugetpage(ppc_map_info_t *info, int count) +{ + int i; + ppc_map_t *PagePtr; + + for( i = 0; i < count; i++ ) + { + if(!info[i].addr && !info[i].proc) + { + PagePtr = &((ppc_map_t*)PAGETAB)[info[i].phys]; + info[i].proc = PagePtr->proc; + info[i].addr = PagePtr->addr; + info[i].flags = MMU_ALL_RW; + } else { + vaddr_t addr = info[i].addr; + int vsid = ((addr >> 28) & 15) | (info[i].proc << 4); + PagePtr = mmuvirtmap(info[i].addr, vsid); + if(!PagePtr) + info[i].phys = 0; + else + { + info[i].phys = PPC_PAGE_ADDR(PagePtr - PpcPageTable); + info[i].flags = MMU_ALL_RW; // HACK + } + } + } +} + +void mmusetvsid(int start, int end, int vsid) +{ + int i, sr, s_vsid; + for(i = start; i < end; i++) + { + s_vsid = (vsid << 4) | (i & 15); + sr = (GetSR(i) & ~PPC_VSID_MASK) | s_vsid; + SetSR(i, sr); + Segs[i] = findvsid(s_vsid); + } +} + +int ptegreload(ppc_trap_frame_t *frame, vaddr_t addr) +{ + int hfun = (Clock >> 3) & 1, ptegnum = PtegNumber(addr, hfun); + int vsid = GetSR((addr >> 28) & 15) & PPC_VSID_MASK; + ppc_map_t *map = mmuvirtmap(addr, vsid); + if(!map) return 0; + map->pte.pteh = (map->pte.pteh & ~64) | (hfun << 6); + PpcHashedPTE[ptegnum].block[Clock & 7] = map->pte; +#if 0 + fmtout("Reloading addr %x (phys %x) at %x[%x] (%x:%x)\r\n", + addr, PPC_PAGE_ADDR(map - PpcPageTable), ptegnum, Clock & 15, + PpcHashedPTE[ptegnum].block[Clock&7].pteh, + PpcHashedPTE[ptegnum].block[Clock&7].ptel); +#endif + Clock++; + __asm__("tlbie %0\n\tsync\n\tisync" : : "r" (addr)); + return 1; +} Added: trunk/reactos/lib/ppcmmu/mmuobject.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/mmuobject.h?rev… ============================================================================== --- trunk/reactos/lib/ppcmmu/mmuobject.h (added) +++ trunk/reactos/lib/ppcmmu/mmuobject.h Sat Oct 6 12:34:33 2007 @@ -1,0 +1,17 @@ +#ifndef _LIBMMU_MMUOBJECT_H +#define _LIBMMU_MMUOBJECT_H + +MmuPageCallback callback; +void initme(); +void mmusetramsize(paddr_t size); +int mmuaddpage(ppc_map_info_t *info, int count); +void mmudelpage(ppc_map_info_t *info, int count); +void mmugetpage(ppc_map_info_t *info, int count); +void mmusetvsid(int start, int end, int vsid); +void *allocvsid(int); +void mmuallocvsid(int vsid, int mask); +void freevsid(int); +void mmufreevsid(int vsid, int mask); +int mmunitest(); + +#endif/*_LIBMMU_MMUOBJECT_H*/ Added: trunk/reactos/lib/ppcmmu/mmutest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/mmutest.c?rev=2… ============================================================================== --- trunk/reactos/lib/ppcmmu/mmutest.c (added) +++ trunk/reactos/lib/ppcmmu/mmutest.c Sat Oct 6 12:34:33 2007 @@ -1,0 +1,23 @@ +#include "ppcmmu/mmu.h" +#include "ppcmmu/mmuutil.h" +#include "mmuobject.h" + +int mmunitest() +{ + int ret; + int (*fun)(int ret) = (void *)0x80000000; + ppc_map_info_t info = { 0 }; + volatile int oldmsr, msr = 0x2030; + __asm__("mfmsr 0\n\tstw 0,0(%0)" : : "r" (&oldmsr)); + mmusetvsid(8, 9, 0); + info.flags = MMU_ALL_RW; + info.proc = 0; + info.addr = (vaddr_t)fun; + mmuaddpage(&info, 1); + __asm__("mtmsr %0" : : "r" (msr)); + __asm__("mtsdr1 %0" : : "r" (HTABORG)); + *((int *)fun) = 0x4e800020; + ret = fun(3); + __asm__("mtmsr %0" : : "r" (oldmsr)); + return ret != 3; +} Added: trunk/reactos/lib/ppcmmu/mmuutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/mmuutil.c?rev=2… ============================================================================== --- trunk/reactos/lib/ppcmmu/mmuutil.c (added) +++ trunk/reactos/lib/ppcmmu/mmuutil.c Sat Oct 6 12:34:33 2007 @@ -1,0 +1,411 @@ +#include "ppcmmu/mmu.h" +#include "ppcmmu/mmuutil.h" + +inline int GetMSR() { + register int res asm ("r3"); + __asm__("mfmsr 3"); + return res; +} + +inline int GetDEC() { + register int res asm ("r3"); + __asm__("mfdec 3"); + return res; +} + +__asm__("\t.globl GetPhys\n" + "GetPhys:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "isync\n\t" + "sync\n\t" + "lwz 3,0(3)\n\t" /* Get actual value at phys addr r3 */ + "mtmsr 5\n\t" + "isync\n\t" + "sync\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +__asm__("\t.globl GetPhysHalf\n" + "GetPhysHalf:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "isync\n\t" + "sync\n\t" + "lhz 3,0(3)\n\t" /* Get actual value at phys addr r3 */ + "mtmsr 5\n\t" + "isync\n\t" + "sync\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +__asm__("\t.globl GetPhysByte\n" + "GetPhysByte:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "isync\n\t" + "sync\n\t" + "lbz 3,0(3)\n\t" /* Get actual value at phys addr r3 */ + "mtmsr 5\n\t" + "isync\n\t" + "sync\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +__asm__("\t.globl SetPhys\n" + "SetPhys:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "sync\n\t" + "eieio\n\t" + "stw 4,0(3)\n\t" /* Set actual value at phys addr r3 */ + "dcbst 0,3\n\t" + "mtmsr 5\n\t" + "sync\n\t" + "eieio\n\t" + "mr 3,4\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +__asm__("\t.globl SetPhysHalf\n" + "SetPhysHalf:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "sync\n\t" + "eieio\n\t" + "sth 4,0(3)\n\t" /* Set actual value at phys addr r3 */ + "dcbst 0,3\n\t" + "mtmsr 5\n\t" + "sync\n\t" + "eieio\n\t" + "mr 3,4\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +__asm__("\t.globl SetPhysByte\n" + "SetPhysByte:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "sync\n\t" + "eieio\n\t" + "stb 4,0(3)\n\t" /* Set actual value at phys addr r3 */ + "dcbst 0,3\n\t" + "mtmsr 5\n\t" + "sync\n\t" + "eieio\n\t" + "mr 3,4\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +inline int GetSR(int n) { + register int res = 0; + switch( n ) { + case 0: + __asm__("mfsr %0,0" : "=r" (res)); + break; + case 1: + __asm__("mfsr %0,1" : "=r" (res)); + break; + case 2: + __asm__("mfsr %0,2" : "=r" (res)); + break; + case 3: + __asm__("mfsr %0,3" : "=r" (res)); + break; + case 4: + __asm__("mfsr %0,4" : "=r" (res)); + break; + case 5: + __asm__("mfsr %0,5" : "=r" (res)); + break; + case 6: + __asm__("mfsr %0,6" : "=r" (res)); + break; + case 7: + __asm__("mfsr %0,7" : "=r" (res)); + break; + case 8: + __asm__("mfsr %0,8" : "=r" (res)); + break; + case 9: + __asm__("mfsr %0,9" : "=r" (res)); + break; + case 10: + __asm__("mfsr %0,10" : "=r" (res)); + break; + case 11: + __asm__("mfsr %0,11" : "=r" (res)); + break; + case 12: + __asm__("mfsr %0,12" : "=r" (res)); + break; + case 13: + __asm__("mfsr %0,13" : "=r" (res)); + break; + case 14: + __asm__("mfsr %0,14" : "=r" (res)); + break; + case 15: + __asm__("mfsr %0,15" : "=r" (res)); + break; + } + return res; +} + +inline void SetSR(int n, int val) { + switch( n ) { + case 0: + __asm__("mtsr 0,%0" : : "r" (val)); + break; + case 1: + __asm__("mtsr 1,%0" : : "r" (val)); + break; + case 2: + __asm__("mtsr 2,%0" : : "r" (val)); + break; + case 3: + __asm__("mtsr 3,%0" : : "r" (val)); + break; + case 4: + __asm__("mtsr 4,%0" : : "r" (val)); + break; + case 5: + __asm__("mtsr 5,%0" : : "r" (val)); + break; + case 6: + __asm__("mtsr 6,%0" : : "r" (val)); + break; + case 7: + __asm__("mtsr 7,%0" : : "r" (val)); + break; + case 8: + __asm__("mtsr 8,%0" : : "r" (val)); + break; + case 9: + __asm__("mtsr 9,%0" : : "r" (val)); + break; + case 10: + __asm__("mtsr 10,%0" : : "r" (val)); + break; + case 11: + __asm__("mtsr 11,%0" : : "r" (val)); + break; + case 12: + __asm__("mtsr 12,%0" : : "r" (val)); + break; + case 13: + __asm__("mtsr 13,%0" : : "r" (val)); + break; + case 14: + __asm__("mtsr 14,%0" : : "r" (val)); + break; + case 15: + __asm__("mtsr 15,%0" : : "r" (val)); + break; + } +} + +void GetBat( int bat, int inst, int *batHi, int *batLo ) { + register int bh asm("r3"), bl asm("r4"); + if( inst ) { + switch( bat ) { + case 0: + __asm__("mfibatu 3,0"); + __asm__("mfibatl 4,0"); + break; + case 1: + __asm__("mfibatu 3,1"); + __asm__("mfibatl 4,1"); + break; + case 2: + __asm__("mfibatu 3,2"); + __asm__("mfibatl 4,2"); + break; + case 3: + __asm__("mfibatu 3,3"); + __asm__("mfibatl 4,3"); + break; + } + } else { + switch( bat ) { + case 0: + __asm__("mfdbatu 3,0"); + __asm__("mfdbatl 4,0"); + break; + case 1: + __asm__("mfdbatu 3,1"); + __asm__("mfdbatl 4,1"); + break; + case 2: + __asm__("mfdbatu 3,2"); + __asm__("mfdbatl 4,2"); + break; + case 3: + __asm__("mfdbatu 3,3"); + __asm__("mfdbatl 4,3"); + break; + } + } + *batHi = bh; + *batLo = bl; +} + +#define BATSET(n,t) \ + case n: __asm__("mt" #t "batu " #n ",%0\n\tmt" #t "batl " #n ",%1" \ + : : "r" (batHi), "r" (batLo)); break; + +void SetBat( int bat, int inst, int batHi, int batLo ) { + if( inst ) { + switch( bat ) { + BATSET(0,i); + BATSET(1,i); + BATSET(2,i); + BATSET(3,i); + } + } else { + switch( bat ) { + BATSET(0,d); + BATSET(1,d); + BATSET(2,d); + BATSET(3,d); + } + } + __asm__("isync\n\tsync"); +} + +inline int GetSDR1() { + register int res asm("r3"); + __asm__("mfsdr1 3"); + return res; +} + +inline void SetSDR1( int sdr ) { + int i,j; + __asm__("mtsdr1 3"); + __asm__("sync"); + __asm__("isync"); + + for( i = 0; i < 256; i++ ) { + j = i << 12; + __asm__("tlbie %0,0" : : "r" (j)); + } + __asm__("eieio"); + __asm__("tlbsync"); + __asm__("ptesync"); +} + +inline int BatTranslate( int batu, int batl, int virt ) { + int mask; + if(batu & 0x3fc) + { + mask = ~(0x1ffff | ((batu & 0x3fc)>>2)<<17); + if((batu & 2) && ((batu & mask) == (virt & mask))) + return (batl & mask) | (virt & ~mask); + } else { + mask = ~(0x1ffff | (batl << 17)); + if(!(batl & 0x40) || ((batu & mask) != (virt & mask))) + return (batl & mask) | (virt & ~mask); + } + return -1; +} + +inline int BatHit( int batu, int batl, int virt ) { + return BatTranslate( batu, batl, virt ) != -1; +} + +/* translate address */ +int PpcVirt2phys( vaddr_t virt, int inst ) { + int msr = GetMSR(); + int txmask = inst ? 0x20 : 0x10; + int i, bath, batl, sr, sdr1, physbase, vahi, valo; + int npteg, hash, hashmask, ptehi, ptelo, ptegaddr; + int vsid, pteh, ptevsid, pteapi; + + if( msr & txmask ) { + sr = GetSR( virt >> 28 ); + vsid = sr & 0xfffffff; + vahi = vsid >> 4; + valo = (vsid << 28) | (virt & 0xfffffff); + if( sr & 0x80000000 ) { + return valo; + } + + for( i = 0; i < 4; i++ ) { + GetBat( i, inst, &bath, &batl ); + if( BatHit( bath, batl, virt ) ) { + return BatTranslate( bath, batl, virt ); + } + } + + sdr1 = GetSDR1(); + + physbase = sdr1 & ~0xffff; + hashmask = ((sdr1 & 0x1ff) << 10) | 0x3ff; + hash = (vsid & 0x7ffff) ^ ((valo >> 12) & 0xffff); + npteg = hashmask + 1; + + for( pteh = 0; pteh < 0x80; pteh += 64, hash ^= 0x7ffff ) { + ptegaddr = ((hashmask & hash) * 64) + physbase; + + for( i = 0; i < 8; i++ ) { + ptehi = GetPhys( ptegaddr + (i * 8) ); + ptelo = GetPhys( ptegaddr + (i * 8) + 4 ); + + ptevsid = (ptehi >> 7) & 0xffffff; + pteapi = ptehi & 0x3f; + + if( (ptehi & 64) != pteh ) continue; + if( ptevsid != (vsid & 0xffffff) ) continue; + if( pteapi != ((virt >> 22) & 0x3f) ) continue; + + return (ptelo & 0xfffff000) | (virt & 0xfff); + } + } + return -1; + } else { + return virt; + } +} + +int PtegNumber(vaddr_t virt, int hfun) +{ + int sr = GetSR( (virt >> 28) & 0xf ); + int vsid = sr & PPC_VSID_MASK; + return ((((vsid & 0x7ffff) ^ ((virt >> 12) & 0xffff)) ^ (hfun ? -1 : 0)) & ((HTABSIZ - 1) >> 3) & 0x3ff); +} Added: trunk/reactos/lib/ppcmmu/ppcmmu.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/ppcmmu.mak?rev=… ============================================================================== --- trunk/reactos/lib/ppcmmu/ppcmmu.mak (added) +++ trunk/reactos/lib/ppcmmu/ppcmmu.mak Sat Oct 6 12:34:33 2007 @@ -1,0 +1,26 @@ +O=$(INTERMEDIATE)/lib/ppcmmu +S=lib/ppcmmu +CC=powerpc-unknown-elf-gcc -I$T/include/reactos/ppcmmu +AR=powerpc-unknown-elf-ar +OBJCOPY=powerpc-unknown-elf-objcopy +LDSCRIPT=-Wl,-T,$S/ldscript +PPCMMU_TARGETS=$O/libppcmmu_code.a + +$O/mmuutil_object.o: $S/mmuutil.c | $O + $(CC) -Iinclude/reactos/libs -g -c -o $@ $S/mmuutil.c + +$O/libppcmmu_code.a: $O/mmuobject.o $O/mmuutil_object.o $O/mmutest.o | $O + $(CC) -Wl,-N -nostartfiles -nostdlib -o $O/mmuobject -Ttext=0x10000 $(LDSCRIPT) -Wl,-u,mmumain -Wl,-u,data_miss_start -Wl,-u,data_miss_end $O/mmuobject.o $O/mmuutil_object.o $O/mmutest.o + $(OBJCOPY) -O binary $O/mmuobject mmucode + $(OBJCOPY) -I binary -O elf32-powerpc -B powerpc:common mmucode $O/mmucode.o + mkdir -p `dirname $@` + $(AR) cr $@ $O/mmucode.o + +$O/mmuobject.o: $S/mmuobject.c $S/mmuobject.h | $O + $(CC) -Iinclude/reactos -Iinclude/reactos/libs -g -c -o $@ $S/mmuobject.c + +$O/mmutest.o: $S/mmutest.c $S/mmuobject.h | $O + $(CC) -Iinclude/reactos/libs -g -c -o $@ $S/mmutest.c + +ppcmmuobject_clean: + rm -f $O/*.o $O/*.a mmucode $O/mmuobject Added: trunk/reactos/lib/ppcmmu/ppcmmu.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/ppcmmu.rbuild?r… ============================================================================== --- trunk/reactos/lib/ppcmmu/ppcmmu.rbuild (added) +++ trunk/reactos/lib/ppcmmu/ppcmmu.rbuild Sat Oct 6 12:34:33 2007 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name="ppcmmu" type="staticlibrary"> + <include base="ppcmmu">.</include> + <define name="__NO_CTYPE_INLINES" /> + <if property="ARCH" value="powerpc"> + <file>mmuutil.c</file> + </if> + <file>dummy.c</file> +</module>

17 years

[arty] 29409: Added missing file.

by arty＠svn.reactos.org

Author: arty Date: Sat Oct 6 12:33:29 2007 New Revision: 29409 URL: http://svn.reactos.org/svn/reactos?rev=29409&view=rev Log: Added missing file. Added: branches/powerpc/reactos/lib/mmu/ppcmmu.rbuild Added: branches/powerpc/reactos/lib/mmu/ppcmmu.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/ppcmmu.… ============================================================================== --- branches/powerpc/reactos/lib/mmu/ppcmmu.rbuild (added) +++ branches/powerpc/reactos/lib/mmu/ppcmmu.rbuild Sat Oct 6 12:33:29 2007 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name="ppcmmu" type="staticlibrary"> + <include base="ppcmmu">.</include> + <define name="__NO_CTYPE_INLINES" /> + <if property="ARCH" value="powerpc"> + <file>mmuutil.c</file> + </if> + <file>dummy.c</file> +</module>

17 years

← Newer
1
...
59
60
61
62
63
64
65
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007