Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mbosma] 25897: Fix wrong text. (right => left)
by mbosma＠svn.reactos.org 23 Feb '07

23 Feb '07

Author: mbosma Date: Sat Feb 24 00:01:04 2007 New Revision: 25897 URL: http://svn.reactos.org/svn/reactos?rev=25897&view=rev Log: Fix wrong text. (right => left) Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/de.rc branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/en.rc Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/de.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/de.rc (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/de.rc Sat Feb 24 00:01:04 2007 @@ -14,7 +14,7 @@ BEGIN IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" IDS_WELCOME_TITLE "Willkommen im ReactOS Downloader" - IDS_WELCOME "Bitte wählen Sie rechts eine Kategorie. Dies ist Version 1.0." + IDS_WELCOME "Bitte wählen Sie links eine Kategorie. Dies ist Version 1.0." IDS_NO_APP_TITLE "Keine Anwendung ausgewählt" IDS_NO_APP "Bitte wählen Sie eine Anwendung, bevor Sie die Download-Schaltfläche betätigen. Wenn Sie Hilfe benötigen, drücken Sie die Hilfe-Schaltfläche in der oberen rechten Ecke." IDS_UPDATE_TITLE "Update" Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/en.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/en.rc (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/en.rc Sat Feb 24 00:01:04 2007 @@ -14,7 +14,7 @@ BEGIN IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" IDS_WELCOME_TITLE "Welcome to the ReactOS Downloader" - IDS_WELCOME "Please choose a category on the right. This is version 1.0." + IDS_WELCOME "Please choose a category on the left. This is version 1.0." IDS_NO_APP_TITLE "No application selected" IDS_NO_APP "Please select a Application before you click the download button, if you need assistance please click on the question mark button on the top right corner." IDS_UPDATE_TITLE "Update"

1 0

[tretiakov] 25896: Andrey Janzen (virus126): - Fix warning when using FEATURE_UNIX_FILENAME_COMPLETION. - Make unix-style completion work correctly. - Make %time% return milliseconds/10.
by tretiakov＠svn.reactos.org 23 Feb '07

23 Feb '07

Author: tretiakov Date: Fri Feb 23 23:05:39 2007 New Revision: 25896 URL: http://svn.reactos.org/svn/reactos?rev=25896&view=rev Log: Andrey Janzen (virus126): - Fix warning when using FEATURE_UNIX_FILENAME_COMPLETION. - Make unix-style completion work correctly. - Make %time% return milliseconds/10. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmdinput.c trunk/reactos/base/shell/cmd/filecomp.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c (original) +++ trunk/reactos/base/shell/cmd/cmd.c Fri Feb 23 23:05:39 2007 @@ -1172,7 +1172,7 @@ GetSystemTime(&t); _sntprintf ( ret, retlen, _T("%02d%c%02d%c%02d%c%02d"), t.wHour, cTimeSeparator, t.wMinute, cTimeSeparator, - t.wSecond, cDecimalSeparator, t.wMilliseconds ); + t.wSecond, cDecimalSeparator, t.wMilliseconds / 10); return ret; } /* %DATE% */ Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdinput.c (original) +++ trunk/reactos/base/shell/cmd/cmdinput.c Fri Feb 23 23:05:39 2007 @@ -139,8 +139,10 @@ TCHAR ch; BOOL bContinue=FALSE;/*is TRUE the second case will not be executed*/ BOOL bReturn = FALSE; - TCHAR szPath[MAX_PATH]; BOOL bCharInput; + #ifdef FEATURE_4NT_FILENAME_COMPLETION + TCHAR szPath[MAX_PATH]; + #endif /* get screen size */ GetScreenSize (&maxx, &maxy); Modified: trunk/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/filecomp.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/filecomp.c (original) +++ trunk/reactos/base/shell/cmd/filecomp.c Fri Feb 23 23:05:39 2007 @@ -43,7 +43,7 @@ LPCOMMAND cmds_ptr; /* expand current file name */ - count = charcount - 1; + count = charcount - 1; if (count < 0) count = 0; @@ -89,6 +89,7 @@ _tcscpy (path, directory); while (curplace >= 0 && directory[curplace] != _T('\\') && + directory[curplace] != _T('/') && directory[curplace] != _T(':')) { directory[curplace] = 0; @@ -205,7 +206,7 @@ BOOL found_dot = FALSE; INT curplace = 0; INT start; - UINT count; + INT count; TCHAR path[MAX_PATH]; TCHAR fname[MAX_PATH]; TCHAR directory[MAX_PATH]; @@ -361,6 +362,7 @@ TCHAR * szSearch; TCHAR * szSearch1; TCHAR * szSearch2; + TCHAR * szSearch3; /* number of quotes in the string */ INT nQuotes = 0; /* used in for loops */ @@ -394,9 +396,12 @@ _tcscpy(szSuffix,szSearch); /* Find the one closest to end */ szSearch1 = _tcsrchr(str, _T('\"')); - szSearch2 = _tcsrchr(str, _T('\\')); + szSearch2 = _tcsrchr(str, _T('\\')); + szSearch3 = _tcsrchr(str, _T('.')); if(szSearch2 != NULL && _tcslen(szSearch1) > _tcslen(szSearch2)) szSearch = szSearch2; + else if(szSearch3 != NULL && _tcslen(szSearch1) > _tcslen(szSearch3)) + szSearch = szSearch3; else szSearch = szSearch1; /* Move one char past */ @@ -436,9 +441,12 @@ /* Find the closest to the end space or \ */ _tcscpy(str,strIN); szSearch1 = _tcsrchr(str, _T(' ')); - szSearch2 = _tcsrchr(str, _T('\\')); + szSearch2 = _tcsrchr(str, _T('\\')); + szSearch3 = _tcsrchr(str, _T('/')); if(szSearch2 != NULL && _tcslen(szSearch1) > _tcslen(szSearch2)) szSearch = szSearch2; + else if(szSearch3 != NULL && _tcslen(szSearch1) > _tcslen(szSearch3)) + szSearch = szSearch3; else szSearch = szSearch1; szSearch++;

1 0

[tretiakov] 25895: Andrey Janzen (virus126): Replace numbers by constants in all translations. Fixes bug 2065.
by tretiakov＠svn.reactos.org 23 Feb '07

23 Feb '07

Author: tretiakov Date: Fri Feb 23 22:52:00 2007 New Revision: 25895 URL: http://svn.reactos.org/svn/reactos?rev=25895&view=rev Log: Andrey Janzen (virus126): Replace numbers by constants in all translations. Fixes bug 2065. Modified: trunk/reactos/base/applications/notepad/lang/cs-CZ.rc trunk/reactos/base/applications/notepad/lang/da-DK.rc trunk/reactos/base/applications/notepad/lang/de-DE.rc trunk/reactos/base/applications/notepad/lang/el-GR.rc trunk/reactos/base/applications/notepad/lang/en-US.rc trunk/reactos/base/applications/notepad/lang/es-ES.rc trunk/reactos/base/applications/notepad/lang/fi-FI.rc trunk/reactos/base/applications/notepad/lang/fr-FR.rc trunk/reactos/base/applications/notepad/lang/hu-HU.rc trunk/reactos/base/applications/notepad/lang/id-ID.rc trunk/reactos/base/applications/notepad/lang/it-IT.rc trunk/reactos/base/applications/notepad/lang/ja-JP.rc trunk/reactos/base/applications/notepad/lang/nb-NO.rc trunk/reactos/base/applications/notepad/lang/nl-NL.rc trunk/reactos/base/applications/notepad/lang/pl-PL.rc trunk/reactos/base/applications/notepad/lang/pt-PT.rc trunk/reactos/base/applications/notepad/lang/ru-RU.rc trunk/reactos/base/applications/notepad/lang/sk-SK.rc trunk/reactos/base/applications/notepad/lang/sl-SI.rc trunk/reactos/base/applications/notepad/lang/sv-SE.rc trunk/reactos/base/applications/notepad/lang/th-TH.rc trunk/reactos/base/applications/notepad/lang/uk-UA.rc trunk/reactos/base/applications/notepad/lang/zh-CN.rc Modified: trunk/reactos/base/applications/notepad/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/cs-CZ.rc (original) +++ trunk/reactos/base/applications/notepad/lang/cs-CZ.rc Fri Feb 23 22:52:00 2007 @@ -105,9 +105,9 @@ LTEXT "&Dolní:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Storno", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Nápovìda", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Storno", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Nápovìda", IDHELP, 180, 39, 40, 15, WS_TABSTOP } IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 Modified: trunk/reactos/base/applications/notepad/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/da-DK.rc (original) +++ trunk/reactos/base/applications/notepad/lang/da-DK.rc Fri Feb 23 22:52:00 2007 @@ -103,9 +103,9 @@ LTEXT "&Bund:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Annuller", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Hjælp", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Annuller", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Hjælp", IDHELP, 180, 39, 40, 15, WS_TABSTOP } IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 Modified: trunk/reactos/base/applications/notepad/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/notepad/lang/de-DE.rc Fri Feb 23 22:52:00 2007 @@ -114,7 +114,7 @@ DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Hilfe", 0x153, 180, 39, 40, 15, WS_TABSTOP +PUSHBUTTON "&Hilfe", IDHELP, 180, 39, 40, 15, WS_TABSTOP } /* Dialog 'Gehe zu...' */ Modified: trunk/reactos/base/applications/notepad/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/el-GR.rc (original) +++ trunk/reactos/base/applications/notepad/lang/el-GR.rc Fri Feb 23 22:52:00 2007 @@ -110,9 +110,9 @@ LTEXT "&ÊÜôù:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Áêýñùóç", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&ÂïÞèåéá", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Áêýñùóç", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&ÂïÞèåéá", IDHELP, 180, 39, 40, 15, WS_TABSTOP } /* Dialog `Encoding' */ Modified: trunk/reactos/base/applications/notepad/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/en-US.rc (original) +++ trunk/reactos/base/applications/notepad/lang/en-US.rc Fri Feb 23 22:52:00 2007 @@ -114,7 +114,7 @@ DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Help", 0x153, 180, 39, 40, 15, WS_TABSTOP +PUSHBUTTON "&Help", IDHELP, 180, 39, 40, 15, WS_TABSTOP } /* Dialog `Encoding' */ Modified: trunk/reactos/base/applications/notepad/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/notepad/lang/es-ES.rc Fri Feb 23 22:52:00 2007 @@ -106,9 +106,9 @@ LTEXT "Aba&jo:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "Aceptar", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Cancelar", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Ayuda", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "Aceptar", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Cancelar", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Ayuda", IDHELP, 180, 39, 40, 15, WS_TABSTOP } IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 Modified: trunk/reactos/base/applications/notepad/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/fi-FI.rc (original) +++ trunk/reactos/base/applications/notepad/lang/fi-FI.rc Fri Feb 23 22:52:00 2007 @@ -101,9 +101,9 @@ LTEXT "&Ala:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Peruuta", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Apua", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Peruuta", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Apua", IDHELP, 180, 39, 40, 15, WS_TABSTOP } IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 Modified: trunk/reactos/base/applications/notepad/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/notepad/lang/fr-FR.rc Fri Feb 23 22:52:00 2007 @@ -113,9 +113,9 @@ LTEXT "&Bas :", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Annuler", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Aide", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Annuler", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Aide", IDHELP, 180, 39, 40, 15, WS_TABSTOP } /* Dialog `Encoding' */ Modified: trunk/reactos/base/applications/notepad/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/hu-HU.rc (original) +++ trunk/reactos/base/applications/notepad/lang/hu-HU.rc Fri Feb 23 22:52:00 2007 @@ -104,9 +104,9 @@ LTEXT "&Alsó:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Mégse", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Súgó", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Mégse", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Súgó", IDHELP, 180, 39, 40, 15, WS_TABSTOP } IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 Modified: trunk/reactos/base/applications/notepad/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/notepad/lang/id-ID.rc Fri Feb 23 22:52:00 2007 @@ -1,205 +1,205 @@ -/* - * Notepad (Indonesian resources) - * - * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> - * Proofread 1998 by David Lee Lambert <lamber45(a)egr.msu.edu> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * Copyright 2007 Zaenal Mutaqin <ade999(a)gmail.com> (Indonesian translation) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT - -ID_ACCEL ACCELERATORS -{ - "^A", CMD_SELECT_ALL - "^C", CMD_COPY - "^F", CMD_SEARCH - "^G", CMD_GOTO - "H", CMD_REPLACE, VIRTKEY, CONTROL - "^O", CMD_OPEN - "^S", CMD_SAVE - "^V", CMD_PASTE - "^X", CMD_CUT - "^Z", CMD_UNDO - VK_F3, CMD_SEARCH_NEXT, VIRTKEY - VK_F5, CMD_TIME_DATE, VIRTKEY -} - -MAIN_MENU MENU -BEGIN - POPUP "&File" - BEGIN - MENUITEM "Bar&u...", CMD_NEW - MENUITEM "&Buka\tCtrl+O", CMD_OPEN - MENUITEM "&Simpan\tCtrl+S", CMD_SAVE - MENUITEM "Simpan seb&agai...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Se&tup Halaman...", CMD_PAGE_SETUP - MENUITEM "&Cetak", CMD_PRINT - MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Keluar", CMD_EXIT - END - POPUP "&Edit" - BEGIN - MENUITEM "&Undo\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", CMD_CUT - MENUITEM "&Copy\tCtrl+C", CMD_COPY - MENUITEM "&Paste\tCtrl+V", CMD_PASTE - MENUITEM "&Hapus\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Ca&ri...\tCtrl+F", CMD_SEARCH - MENUITEM "Cari berikut&nya\tF3", CMD_SEARCH_NEXT - MENUITEM "Ganti\tCtrl+H", CMD_REPLACE - MENUITEM "Pergi Ke...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Pilih semu&a\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Jam/Tanggal\tF5", CMD_TIME_DATE - END - POPUP "F&ormat" - BEGIN - MENUITEM "&Gulung baris panjang", CMD_WRAP - MENUITEM "&Font...", CMD_FONT - END - POPUP "&Lihat" - BEGIN - MENUITEM "Status&bar", CMD_STATUSBAR - END - POPUP "&Bantuan" - BEGIN - MENUITEM "&Daftar Isi", CMD_HELP_CONTENTS - MENUITEM "&Cari...", CMD_HELP_SEARCH - MENUITEM "&Bantuan pada bantuan", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&Tentang" CMD_ABOUT - MENUITEM "Inf&o", CMD_ABOUT_WINE - END -END - -/* Dialog `Page setup' */ - -DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" -CAPTION "Setup Halaman" -{ -LTEXT "&Header:", 0x140, 10, 07, 40, 15 -EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "&Footer:", 0x142, 10, 24, 40, 15 -EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP - -GROUPBOX "&Marjin:", 0x144, 10, 43,160, 45 -LTEXT "K&iri:", 0x145, 20, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&Atas:", 0x148, 20, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "Ka&nan:", 0x14B, 100, 55, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "Ba&wah:", 0x14E,100, 73, 30, 10, WS_CHILD -EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP - -DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Batal", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Bantuan", 0x153, 180, 39, 40, 15, WS_TABSTOP -} - -/* Dialog `Encoding' */ -DIALOG_ENCODING DIALOG 0, 0, 256, 44 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | - WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" -CAPTION "Enkoding" -{ -COMBOBOX ID_ENCODING,54,0,156,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP -LTEXT "Enkoding:",0x155,5,2,41,12 -COMBOBOX ID_EOLN,54,18,156,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP -LTEXT "Akhirbaris:",0x156,5,20,41,12 -} - -/* Dialog 'Go To' */ -DIALOG_GOTO DIALOG 0,0,165,50 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" -CAPTION "Pergi ke baris" -{ -EDITTEXT ID_LINENUMBER,54,10,106,12,WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "Nomor baris:",0x155,5,12,41,12,WS_CHILD | WS_TABSTOP | ES_NUMBER -DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP -PUSHBUTTON "Batal", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP -} - -IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Tentang ReactOS Notepad" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nHak Cipta 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nHak Cipta 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nHak Cipta 2002 Andriy Palamarchuk\r\n", - -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39 - CONTROL " ", - -1,"Static",0x50000000,8,48,272,11 - DEFPUSHBUTTON "Close",IDOK,114,149,44,15,WS_GROUP - ICON IDI_NPICON,-1,12,9,20,30 - EDITTEXT IDC_LICENSE,8,64,272,81,ES_MULTILINE | - ES_READONLY | WS_VSCROLL -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_LICENSE, "Program ini adalah software bebas; anda dapat mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU. Lihat GNU General Public License untuk lebih jelasnya.\r\n\r\nAnda seharusnya menerima duplikat GNU General Public License bersamaan dengan program ini; jika tidak, tulis ke Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." -END - -STRINGTABLE DISCARDABLE -{ -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Halaman &s" /* FIXME */ -STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ -STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ - -STRING_NOTEPAD, "Notepad" -STRING_ERROR, "SALAH" -STRING_WARNING, "PERINGATAN" -STRING_INFO, "Informasi" - -STRING_UNTITLED, "(tanpa judul)" - -STRING_ALL_FILES, "Semua file (*.*)" -STRING_TEXT_FILES_TXT, "File teks (*.txt)" - -STRING_TOOLARGE, "File '%s' terlalu besar untuk notepad.\n \ -Please use a different editor." -STRING_NOTEXT, "Anda tidak memasukkan teks apapun. \ -\nPlease type something and try again" -STRING_DOESNOTEXIST, "File '%s'\ntidak ada\n\n \ -Do you want to create a new file ?" -STRING_NOTSAVED, "File '%s'\nsudah diubah\n\n \ -Would you like to save the changes ?" -STRING_NOTFOUND, "'%s' tidak bisa ditemukan." -STRING_OUT_OF_MEMORY, "Memori tidak cukup untuk menyelesaikan tugas \ -ini. \nTutup satu atau lebih aplikasi untuk meningkatkan jumlah \nmemori \ -bebas." -STRING_CANNOTFIND "Tidak bisa menemukan '%s'" -STRING_ANSI, "ANSI" -STRING_UNICODE, "Unicode" -STRING_UNICODE_BE, "Unicode (big endian)" -STRING_UTF8, "UTF-8" -STRING_CRLF, "Windows" -STRING_LF, "Unix" -STRING_CR, "Mac" -} +/* + * Notepad (Indonesian resources) + * + * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> + * Proofread 1998 by David Lee Lambert <lamber45(a)egr.msu.edu> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2007 Zaenal Mutaqin <ade999(a)gmail.com> (Indonesian translation) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT + +ID_ACCEL ACCELERATORS +{ + "^A", CMD_SELECT_ALL + "^C", CMD_COPY + "^F", CMD_SEARCH + "^G", CMD_GOTO + "H", CMD_REPLACE, VIRTKEY, CONTROL + "^O", CMD_OPEN + "^S", CMD_SAVE + "^V", CMD_PASTE + "^X", CMD_CUT + "^Z", CMD_UNDO + VK_F3, CMD_SEARCH_NEXT, VIRTKEY + VK_F5, CMD_TIME_DATE, VIRTKEY +} + +MAIN_MENU MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "Bar&u...", CMD_NEW + MENUITEM "&Buka\tCtrl+O", CMD_OPEN + MENUITEM "&Simpan\tCtrl+S", CMD_SAVE + MENUITEM "Simpan seb&agai...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Se&tup Halaman...", CMD_PAGE_SETUP + MENUITEM "&Cetak", CMD_PRINT + MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Keluar", CMD_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "&Undo\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", CMD_CUT + MENUITEM "&Copy\tCtrl+C", CMD_COPY + MENUITEM "&Paste\tCtrl+V", CMD_PASTE + MENUITEM "&Hapus\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Ca&ri...\tCtrl+F", CMD_SEARCH + MENUITEM "Cari berikut&nya\tF3", CMD_SEARCH_NEXT + MENUITEM "Ganti\tCtrl+H", CMD_REPLACE + MENUITEM "Pergi Ke...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Pilih semu&a\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Jam/Tanggal\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "&Gulung baris panjang", CMD_WRAP + MENUITEM "&Font...", CMD_FONT + END + POPUP "&Lihat" + BEGIN + MENUITEM "Status&bar", CMD_STATUSBAR + END + POPUP "&Bantuan" + BEGIN + MENUITEM "&Daftar Isi", CMD_HELP_CONTENTS + MENUITEM "&Cari...", CMD_HELP_SEARCH + MENUITEM "&Bantuan pada bantuan", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Tentang" CMD_ABOUT + MENUITEM "Inf&o", CMD_ABOUT_WINE + END +END + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Setup Halaman" +{ +LTEXT "&Header:", 0x140, 10, 07, 40, 15 +EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +LTEXT "&Footer:", 0x142, 10, 24, 40, 15 +EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "&Marjin:", 0x144, 10, 43,160, 45 +LTEXT "K&iri:", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Atas:", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "Ka&nan:", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "Ba&wah:", 0x14E,100, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Batal", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Bantuan", IDHELP, 180, 39, 40, 15, WS_TABSTOP +} + +/* Dialog `Encoding' */ +DIALOG_ENCODING DIALOG 0, 0, 256, 44 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | + WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Enkoding" +{ +COMBOBOX ID_ENCODING,54,0,156,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP +LTEXT "Enkoding:",0x155,5,2,41,12 +COMBOBOX ID_EOLN,54,18,156,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +LTEXT "Akhirbaris:",0x156,5,20,41,12 +} + +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOG 0,0,165,50 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Pergi ke baris" +{ +EDITTEXT ID_LINENUMBER,54,10,106,12,WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "Nomor baris:",0x155,5,12,41,12,WS_CHILD | WS_TABSTOP | ES_NUMBER +DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP +PUSHBUTTON "Batal", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP +} + +IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Tentang ReactOS Notepad" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "ReactOS Notepad v1.0\r\nHak Cipta 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nHak Cipta 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nHak Cipta 2002 Andriy Palamarchuk\r\n", + -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39 + CONTROL " ", + -1,"Static",0x50000000,8,48,272,11 + DEFPUSHBUTTON "Close",IDOK,114,149,44,15,WS_GROUP + ICON IDI_NPICON,-1,12,9,20,30 + EDITTEXT IDC_LICENSE,8,64,272,81,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_LICENSE, "Program ini adalah software bebas; anda dapat mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU. Lihat GNU General Public License untuk lebih jelasnya.\r\n\r\nAnda seharusnya menerima duplikat GNU General Public License bersamaan dengan program ini; jika tidak, tulis ke Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." +END + +STRINGTABLE DISCARDABLE +{ +STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "Halaman &s" /* FIXME */ +STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ + +STRING_NOTEPAD, "Notepad" +STRING_ERROR, "SALAH" +STRING_WARNING, "PERINGATAN" +STRING_INFO, "Informasi" + +STRING_UNTITLED, "(tanpa judul)" + +STRING_ALL_FILES, "Semua file (*.*)" +STRING_TEXT_FILES_TXT, "File teks (*.txt)" + +STRING_TOOLARGE, "File '%s' terlalu besar untuk notepad.\n \ +Please use a different editor." +STRING_NOTEXT, "Anda tidak memasukkan teks apapun. \ +\nPlease type something and try again" +STRING_DOESNOTEXIST, "File '%s'\ntidak ada\n\n \ +Do you want to create a new file ?" +STRING_NOTSAVED, "File '%s'\nsudah diubah\n\n \ +Would you like to save the changes ?" +STRING_NOTFOUND, "'%s' tidak bisa ditemukan." +STRING_OUT_OF_MEMORY, "Memori tidak cukup untuk menyelesaikan tugas \ +ini. \nTutup satu atau lebih aplikasi untuk meningkatkan jumlah \nmemori \ +bebas." +STRING_CANNOTFIND "Tidak bisa menemukan '%s'" +STRING_ANSI, "ANSI" +STRING_UNICODE, "Unicode" +STRING_UNICODE_BE, "Unicode (big endian)" +STRING_UTF8, "UTF-8" +STRING_CRLF, "Windows" +STRING_LF, "Unix" +STRING_CR, "Mac" +} Modified: trunk/reactos/base/applications/notepad/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/notepad/lang/it-IT.rc Fri Feb 23 22:52:00 2007 @@ -107,9 +107,9 @@ LTEXT "In&feriore:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Annulla", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Aiuto", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Annulla", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Aiuto", IDHELP, 180, 39, 40, 15, WS_TABSTOP } IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 Modified: trunk/reactos/base/applications/notepad/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ja-JP.rc (original) +++ trunk/reactos/base/applications/notepad/lang/ja-JP.rc Fri Feb 23 22:52:00 2007 @@ -112,9 +112,9 @@ LTEXT "º(&B):", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "LZ", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "wv(&H)", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "LZ", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "wv(&H)", IDHELP, 180, 39, 40, 15, WS_TABSTOP } /* Dialog `Encoding' */ Modified: trunk/reactos/base/applications/notepad/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/notepad/lang/nb-NO.rc Fri Feb 23 22:52:00 2007 @@ -114,7 +114,7 @@ DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Hjelp", 0x153, 180, 39, 40, 15, WS_TABSTOP +PUSHBUTTON "&Hjelp", IDHELP, 180, 39, 40, 15, WS_TABSTOP } /* Dialog `Encoding' */ Modified: trunk/reactos/base/applications/notepad/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/nl-NL.rc (original) +++ trunk/reactos/base/applications/notepad/lang/nl-NL.rc Fri Feb 23 22:52:00 2007 @@ -102,9 +102,9 @@ LTEXT "&Onder:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Annuleren", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Help", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Annuleren", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Help", IDHELP, 180, 39, 40, 15, WS_TABSTOP } IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 Modified: trunk/reactos/base/applications/notepad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/notepad/lang/pl-PL.rc Fri Feb 23 22:52:00 2007 @@ -105,9 +105,9 @@ LTEXT "&Dolny:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Anuluj", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Pomoc", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Anuluj", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Pomoc", IDHELP, 180, 39, 40, 15, WS_TABSTOP } IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 Modified: trunk/reactos/base/applications/notepad/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/pt-PT.rc (original) +++ trunk/reactos/base/applications/notepad/lang/pt-PT.rc Fri Feb 23 22:52:00 2007 @@ -105,9 +105,9 @@ LTEXT "&Inferior:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Cancelar", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Ajuda", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Cancelar", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Ajuda", IDHELP, 180, 39, 40, 15, WS_TABSTOP } Modified: trunk/reactos/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/notepad/lang/ru-RU.rc Fri Feb 23 22:52:00 2007 @@ -100,9 +100,9 @@ LTEXT "&Íèæíåå:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Îòìåíà", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Ñïðàâêà", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Îòìåíà", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Ñïðàâêà", IDHELP, 180, 39, 40, 15, WS_TABSTOP } IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 Modified: trunk/reactos/base/applications/notepad/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/notepad/lang/sk-SK.rc Fri Feb 23 22:52:00 2007 @@ -107,9 +107,9 @@ LTEXT "&Bottom:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Cancel", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Help", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Cancel", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Help", IDHELP, 180, 39, 40, 15, WS_TABSTOP } IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 Modified: trunk/reactos/base/applications/notepad/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/sl-SI.rc (original) +++ trunk/reactos/base/applications/notepad/lang/sl-SI.rc Fri Feb 23 22:52:00 2007 @@ -101,9 +101,9 @@ LTEXT "&Spodaj:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "V redu", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Preklièi", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Pomoè", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "V redu", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Preklièi", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Pomoè", IDHELP, 180, 39, 40, 15, WS_TABSTOP } IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 Modified: trunk/reactos/base/applications/notepad/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/sv-SE.rc (original) +++ trunk/reactos/base/applications/notepad/lang/sv-SE.rc Fri Feb 23 22:52:00 2007 @@ -103,9 +103,9 @@ LTEXT "&Nederkant:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Avbryt", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Hjälp", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Avbryt", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Hjälp", IDHELP, 180, 39, 40, 15, WS_TABSTOP } IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 Modified: trunk/reactos/base/applications/notepad/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/notepad/lang/th-TH.rc Fri Feb 23 22:52:00 2007 @@ -102,9 +102,9 @@ LTEXT "ÅèÒ§:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "µ¡Å§", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Â¡àÅÔ¡", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "ªèÇÂàËÅÕÍ", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "µ¡Å§", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "ªèÇÂàËÅÕÍ", IDHELP, 180, 39, 40, 15, WS_TABSTOP } IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170 Modified: trunk/reactos/base/applications/notepad/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/notepad/lang/uk-UA.rc Fri Feb 23 22:52:00 2007 @@ -105,9 +105,9 @@ LTEXT "&Íèæíº:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Ñêàñóâàòè", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Äîâ³äêà", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Äîâ³äêà", IDHELP, 180, 39, 40, 15, WS_TABSTOP } /* Dialog `Encoding' */ Modified: trunk/reactos/base/applications/notepad/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/zh-CN.rc (original) +++ trunk/reactos/base/applications/notepad/lang/zh-CN.rc Fri Feb 23 22:52:00 2007 @@ -101,9 +101,9 @@ LTEXT "ÏÂ£¨&B£©£º", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "È·¶¨", 0x151, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "È¡Ïû", 0x152, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "°ïÖú£¨&£©", 0x153, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "È·¶¨", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "È¡Ïû", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "°ïÖú£¨&£©", IDHELP, 180, 39, 40, 15, WS_TABSTOP } IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170

1 0

[ion] 25894: - Update FreeLDR PE Loading to actually use its Mm routines to allocate a buffer to read an image file into, then to allocate the actual load base and use the same code as in sysldr.c right now to PE-load the image into memory, then free the original read buffer. Not yet enabled for drivers! - This means that: - 1) FreeLDR now keeps memory accounting information for the image files it loads, instead of us randomly writing to memory. - 2) We now skip sections marked as NO_LOAD. The k
by ion＠svn.reactos.org 23 Feb '07

23 Feb '07

Author: ion Date: Fri Feb 23 22:48:25 2007 New Revision: 25894 URL: http://svn.reactos.org/svn/reactos?rev=25894&view=rev Log: - Update FreeLDR PE Loading to actually use its Mm routines to allocate a buffer to read an image file into, then to allocate the actual load base and use the same code as in sysldr.c right now to PE-load the image into memory, then free the original read buffer. Not yet enabled for drivers! - This means that: - 1) FreeLDR now keeps memory accounting information for the image files it loads, instead of us randomly writing to memory. - 2) We now skip sections marked as NO_LOAD. The kernel already re-mapped drivers doing this, but it didn't remap the kernel/hal, plus we still had to map the drivers once in FreeLDR, so we're saving a meg+ of kernel memory. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Fri Feb 23 22:48:25 2007 @@ -598,46 +598,64 @@ return STATUS_SUCCESS; } -VOID -NTAPI -FrLdrReMapImage(IN PIMAGE_NT_HEADERS NtHeader, - IN PVOID Base) -{ +ULONG +NTAPI +FrLdrReMapImage(IN PVOID Base, + IN PVOID LoadBase) +{ + PIMAGE_NT_HEADERS NtHeader; PIMAGE_SECTION_HEADER Section; - ULONG SectionCount, SectionSize; - PVOID SourceSection, TargetSection; - INT i; - - /* Load the first section */ + ULONG i, Size, DriverSize = 0; + + /* Get the first section */ + NtHeader = RtlImageNtHeader(Base); Section = IMAGE_FIRST_SECTION(NtHeader); - SectionCount = NtHeader->FileHeader.NumberOfSections - 1; - - /* Now go to the last section */ - Section += SectionCount; - - /* Walk each section backwards */ - for (i = SectionCount; i >= 0; i--, Section--) - { - /* Get the disk location and the memory location, and the size */ - SourceSection = RVA(Base, Section->PointerToRawData); - TargetSection = RVA(Base, Section->VirtualAddress); - SectionSize = Section->SizeOfRawData; - - /* If the section is already mapped correctly, go to the next */ - if (SourceSection == TargetSection) continue; - - /* Load it into memory */ - RtlMoveMemory(TargetSection, SourceSection, SectionSize); - - /* Check for uninitialized data */ - if (Section->SizeOfRawData < Section->Misc.VirtualSize) - { - /* Zero it out */ - RtlZeroMemory(RVA(Base, Section->VirtualAddress + - Section->SizeOfRawData), - Section->Misc.VirtualSize - Section->SizeOfRawData); - } - } + + /* Determine the size of the module */ + for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) + { + /* Skip this section if we're not supposed to load it */ + if (!(Section[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) + { + /* Add the size of this section into the total size */ + Size = Section[i].VirtualAddress + Section[i].Misc.VirtualSize; + DriverSize = max(DriverSize, Size); + } + } + + /* Round up the driver size to section alignment */ + DriverSize = ROUND_UP(DriverSize, NtHeader->OptionalHeader.SectionAlignment); + + /* Allocate memory for the driver */ + LoadBase = MmAllocateMemoryAtAddress(DriverSize, LoadBase); + ASSERT(LoadBase); + + /* Copy headers over */ + RtlMoveMemory(LoadBase, + Base, + NtHeader->OptionalHeader.SizeOfHeaders); + + /* Copy image sections into virtual section */ + for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) + { + /* Get the size of this section and check if it's valid and on-disk */ + Size = Section[i].VirtualAddress + Section[i].Misc.VirtualSize; + if ((Size <= DriverSize) && (Section[i].SizeOfRawData)) + { + /* Copy the data from the disk to the image */ + RtlCopyMemory((PVOID)((ULONG_PTR)LoadBase + + Section[i].VirtualAddress), + (PVOID)((ULONG_PTR)Base + + Section[i].PointerToRawData), + Section[i].Misc.VirtualSize > + Section[i].SizeOfRawData ? + Section[i].SizeOfRawData : + Section[i].Misc.VirtualSize); + } + } + + /* Return the size of the mapped driver */ + return DriverSize; } BOOLEAN @@ -646,32 +664,40 @@ IN PCHAR Name, IN ULONG ImageType) { - PIMAGE_NT_HEADERS NtHeader; - PVOID ImageBase, LoadBase; + PVOID ImageBase, LoadBase, ReadBuffer; + ULONG ImageId = LoaderBlock.ModsCount; ULONG ImageSize; - ULONG ImageId = LoaderBlock.ModsCount; /* Set the virtual (image) and physical (load) addresses */ LoadBase = (PVOID)NextModuleBase; ImageBase = RVA(LoadBase , -KERNEL_BASE_PHYS + KSEG0_BASE); - /* Load the first 1024 bytes of the HAL image so we can read the PE header */ - if (!FsReadFile(Image, 1024, NULL, LoadBase)) return FALSE; - - /* Now read the MZ header to get the offset to the PE Header */ - NtHeader = RtlImageNtHeader(LoadBase); - /* Save the Image Size */ - ImageSize = NtHeader->OptionalHeader.SizeOfImage; + ImageSize = FsGetFileSize(Image); /* Set the file pointer to zero */ FsSetFilePointer(Image, 0); - /* Load the file image */ - FsReadFile(Image, ImageSize, NULL, LoadBase); - - /* Map it into virtual memory */ - if (ImageType != 2) FrLdrReMapImage(NtHeader, LoadBase); + if (ImageType != 2) + { + /* Allocate a temporary buffer for the read */ + ReadBuffer = MmAllocateMemory(ImageSize); + + /* Load the file image */ + FsReadFile(Image, ImageSize, NULL, ReadBuffer); + + /* Map it into virtual memory */ + ImageSize = FrLdrReMapImage(ReadBuffer, LoadBase); + + /* Free the temporary buffer */ + MmFreeMemory(ReadBuffer); + } + else + { + /* Load the file image */ + FsReadFile(Image, ImageSize, NULL, LoadBase); + ImageSize = RtlImageNtHeader(LoadBase)->OptionalHeader.SizeOfImage; + } /* Calculate Difference between Real Base and Compiled Base*/ if (ImageType != 2) LdrRelocateImageWithBias(LoadBase, @@ -698,6 +724,8 @@ /* Load HAL if this is the kernel */ if (ImageType == 1) { + PIMAGE_NT_HEADERS NtHeader; + NtHeader = RtlImageNtHeader(LoadBase); KernelBase = NtHeader->OptionalHeader.ImageBase; KernelEntry = RaToPa(NtHeader->OptionalHeader.AddressOfEntryPoint); FrLdrLoadImage("hal.dll", 10, FALSE); Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Fri Feb 23 22:48:25 2007 @@ -839,7 +839,9 @@ PWCHAR FileNameWithoutPath; LPWSTR FileExtension; PUNICODE_STRING ModuleName = &LdrEntry->BaseDllName; +#if 1 // Disable for FreeLDR 2.5 PLDR_DATA_TABLE_ENTRY ModuleObject; +#endif /* @@ -873,9 +875,11 @@ } /* - * Load the module. Remove for FreeLDR 2.5. + * Load the module. */ RtlCreateUnicodeString(&DeviceNode->ServiceName, FileNameWithoutPath); + +#if 1 // Remove for FreeLDR 2.5. Status = LdrProcessDriverModule(LdrEntry, &DeviceNode->ServiceName, &ModuleObject); if (!NT_SUCCESS(Status)) { @@ -883,6 +887,7 @@ CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); return Status; } +#endif /* Load symbols */ KDB_SYMBOLFILE_HOOK(ModuleName); @@ -900,7 +905,7 @@ /* * Initialize the driver */ - Status = IopInitializeDriverModule(DeviceNode, ModuleObject, + Status = IopInitializeDriverModule(DeviceNode, LdrEntry, &DeviceNode->ServiceName, FALSE, &DriverObject); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Fri Feb 23 22:48:25 2007 @@ -1063,8 +1063,10 @@ PIMAGE_DATA_DIRECTORY DataDirectory; PVOID DllBase, NewImageAddress; NTSTATUS Status; +#if 1 // Disable for FreeLDR 2.5 ULONG DriverSize = 0, Size; PIMAGE_SECTION_HEADER Section; +#endif /* Loop driver list */ for (NextEntry = LoaderBlock->LoadOrderListHead.Flink; @@ -1157,7 +1159,7 @@ #if 0 // Enable for FreeLDR 2.5 /* Now copy the entire driver over */ - RtlCopyMemory(NewImageAddress, DllBase, DriverSize); + RtlCopyMemory(NewImageAddress, DllBase, LdrEntry->SizeOfImage); #else /* Copy headers over */ RtlCopyMemory(NewImageAddress,

1 0

[tretiakov] 25893: Update keyboard layout names. Add "Layout Id" key for Us-Dvorak. Rename kbdse.dll to kbdsw.dll
by tretiakov＠svn.reactos.org 23 Feb '07

23 Feb '07

Author: tretiakov Date: Fri Feb 23 21:41:48 2007 New Revision: 25893 URL: http://svn.reactos.org/svn/reactos?rev=25893&view=rev Log: Update keyboard layout names. Add "Layout Id" key for Us-Dvorak. Rename kbdse.dll to kbdsw.dll Added: trunk/reactos/dll/keyboard/kbdsw/ - copied from r25798, trunk/reactos/dll/keyboard/kbdse/ trunk/reactos/dll/keyboard/kbdsw/kbdsw.c - copied unchanged from r25798, trunk/reactos/dll/keyboard/kbdse/kbdse.c trunk/reactos/dll/keyboard/kbdsw/kbdsw.def - copied unchanged from r25798, trunk/reactos/dll/keyboard/kbdse/kbdse.def trunk/reactos/dll/keyboard/kbdsw/kbdsw.rbuild - copied, changed from r25798, trunk/reactos/dll/keyboard/kbdse/kbdse.rbuild trunk/reactos/dll/keyboard/kbdsw/kbdsw.rc - copied unchanged from r25798, trunk/reactos/dll/keyboard/kbdse/kbdse.rc Removed: trunk/reactos/dll/keyboard/kbdse/ trunk/reactos/dll/keyboard/kbdsw/kbdse.c trunk/reactos/dll/keyboard/kbdsw/kbdse.def trunk/reactos/dll/keyboard/kbdsw/kbdse.rbuild trunk/reactos/dll/keyboard/kbdsw/kbdse.rc Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/dll/keyboard/keyboard.rbuild Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Fri Feb 23 21:41:48 2007 @@ -42,33 +42,34 @@ ; Keyboard Layouts HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout File",0x00000000,"kbdda.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout Text",0x00000000,"DA" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout Text",0x00000000,"Danish" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040A","Layout File",0x00000000,"kbdes.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040A","Layout Text",0x00000000,"ES" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040A","Layout Text",0x00000000,"Spanish" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout File",0x00000000,"kbdgr.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout Text",0x00000000,"GR" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout Text",0x00000000,"German" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000409","Layout File",0x00000000,"kbdus.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000409","Layout Text",0x00000000,"US" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000409","Layout Text",0x00000000,"United States" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00010409","Layout File",0x00000000,"kbddv.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00010409","Layout Id", 0x00000000,"0002" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00010409","Layout Text",0x00000000,"US-Dvorak" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040c","Layout File",0x00000000,"kbdfr.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040c","Layout Text",0x00000000,"FR" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040c","Layout Text",0x00000000,"French" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000410","Layout File",0x00000000,"kbdit.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000410","Layout Text",0x00000000,"IT" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000410","Layout Text",0x00000000,"Italian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout File",0x00000000,"kbdru.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout Text",0x00000000,"Russian" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout File",0x00000000,"kbdse.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout Text",0x00000000,"SE" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout File",0x00000000,"kbdsw.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout Text",0x00000000,"Swedish" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout File",0x00000000,"kbdth.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout Text",0x00000000,"Thai" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout File",0x00000000,"kbdur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout Text",0x00000000,"Ukrainian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout File",0x00000000,"kbduk.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout Text",0x00000000,"UK" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout Text",0x00000000,"United Kingdom" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layout File",0x00000000,"kbdsg.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layout Text",0x00000000,"SG" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layout Text",0x00000000,"Swiss German" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000813","Layout File",0x00000000,"kbdbe.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000813","Layout Text",0x00000000,"BE (point)" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000813","Layout Text",0x00000000,"Belgian Dutch" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000408","Layout File",0x00000000,"kbdhe.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000408","Layout Text",0x00000000,"Greek" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041b","Layout File",0x00000000,"kbdsk.dll" @@ -76,7 +77,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000816","Layout File",0x00000000,"kbdpo.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000816","Layout Text",0x00000000,"Portuguese" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000411","Layout File",0x00000000,"kbdja.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000411","Layout Text",0x00000000,"JP" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000411","Layout Text",0x00000000,"Japanese" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Adapters" Removed: trunk/reactos/dll/keyboard/kbdsw/kbdse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdse/kbdse.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsw/kbdse.c (original) +++ trunk/reactos/dll/keyboard/kbdsw/kbdse.c (removed) @@ -1,491 +1,0 @@ -/* - * ReactOS Swedish ASCII Keyboard layout - * Copyright (C) 2004 ReactOS - * License: LGPL, see: LGPL.txt - * - * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php - * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html - */ - -#include <windows.h> -#include <internal/kbd.h> - -#ifdef _M_IA64 -#define ROSDATA static __declspec(allocate(".data")) -#else -#ifdef _MSC_VER -#pragma data_seg(".data") -#define ROSDATA static -#else -#define ROSDATA static __attribute__((section(".data"))) -#endif -#endif - -#define VK_EMPTY 0xff /* The non-existent VK */ -#define KSHIFT 0x001 /* Shift modifier */ -#define KCTRL 0x002 /* Ctrl modifier */ -#define KALT 0x004 /* Alt modifier */ -#define KEXT 0x100 /* Extended key code */ -#define KMULTI 0x200 /* Multi-key */ -#define KSPEC 0x400 /* Special key */ -#define KNUMP 0x800 /* Number-pad */ -#define KNUMS 0xc00 /* Special + number pad */ -#define KMEXT 0x300 /* Multi + ext */ - -#define SHFT_INVALID 0x0F - -ROSDATA USHORT scancode_to_vk[] = { - /* Numbers Row */ - /* - 00 - */ - /* 1 ... 2 ... 3 ... 4 ... */ - VK_EMPTY, VK_ESCAPE, '1', '2', - '3', '4', '5', '6', - '7', '8', '9', '0', - VK_OEM_PLUS, VK_OEM_4, VK_BACK, - /* - 0f - */ - /* First Letters Row */ - VK_TAB, 'Q', 'W', 'E', - 'R', 'T', 'Y', 'U', - 'I', 'O', 'P', - VK_OEM_6, VK_OEM_1, VK_RETURN, - /* - 1d - */ - /* Second Letters Row */ - VK_LCONTROL, - 'A', 'S', 'D', 'F', - 'G', 'H', 'J', 'K', - 'L', VK_OEM_3, VK_OEM_7, VK_OEM_5, - VK_LSHIFT, VK_OEM_2, - /* - 2c - */ - /* Third letters row */ - 'Z', 'X', 'C', 'V', - 'B', 'N', 'M', VK_OEM_COMMA, - VK_OEM_PERIOD,VK_OEM_MINUS, VK_RSHIFT, - /* - 37 - */ - /* Bottom Row */ - VK_MULTIPLY, VK_LMENU, VK_SPACE, VK_CAPITAL, - - /* - 3b - */ - /* F-Keys */ - VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, - VK_F7, VK_F8, VK_F9, VK_F10, - /* - 45 - */ - /* Locks */ - VK_NUMLOCK | KMEXT, - VK_SCROLL | KMULTI, - /* - 47 - */ - /* Number-Pad */ - VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, - VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, - VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, - VK_INSERT | KNUMS, VK_DELETE | KNUMS, - /* - 54 - */ - /* Presumably PrtSc */ - VK_SNAPSHOT, - /* - 55 - */ - /* Oddities, and the remaining standard F-Keys */ - VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, - /* - 59 - */ - VK_CLEAR, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* EREOF */ - VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* ZOOM */ - VK_HELP, - /* - 64 - */ - /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ - VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, - VK_F21, VK_F22, VK_F23, - /* - 6f - */ - /* Not sure who uses these codes */ - VK_EMPTY, VK_EMPTY, VK_EMPTY, - /* - 72 - */ - VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, - /* - 76 - */ - /* One more f-key */ - VK_F24, - /* - 77 - */ - VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, - VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */ - VK_EMPTY, - /* - 80 - */ - 0 -}; - -ROSDATA VSC_VK extcode0_to_vk[] = { - { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, - { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, - { 0x1D, VK_RCONTROL | KEXT }, - { 0x20, VK_VOLUME_MUTE | KEXT }, - { 0x21, VK_LAUNCH_APP2 | KEXT }, - { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, - { 0x24, VK_MEDIA_STOP | KEXT }, - { 0x2E, VK_VOLUME_DOWN | KEXT }, - { 0x30, VK_VOLUME_UP | KEXT }, - { 0x32, VK_BROWSER_HOME | KEXT }, - { 0x35, VK_DIVIDE | KEXT }, - { 0x37, VK_SNAPSHOT | KEXT }, - { 0x38, VK_RMENU | KEXT }, - { 0x47, VK_HOME | KEXT }, - { 0x48, VK_UP | KEXT }, - { 0x49, VK_PRIOR | KEXT }, - { 0x4B, VK_LEFT | KEXT }, - { 0x4D, VK_RIGHT | KEXT }, - { 0x4F, VK_END | KEXT }, - { 0x50, VK_DOWN | KEXT }, - { 0x51, VK_NEXT | KEXT }, - { 0x52, VK_INSERT | KEXT }, - { 0x53, VK_DELETE | KEXT }, - { 0x5B, VK_LWIN | KEXT }, - { 0x5C, VK_RWIN | KEXT }, - { 0x5D, VK_APPS | KEXT }, - { 0x5F, VK_SLEEP | KEXT }, - { 0x65, VK_BROWSER_SEARCH | KEXT }, - { 0x66, VK_BROWSER_FAVORITES | KEXT }, - { 0x67, VK_BROWSER_REFRESH | KEXT }, - { 0x68, VK_BROWSER_STOP | KEXT }, - { 0x69, VK_BROWSER_FORWARD | KEXT }, - { 0x6A, VK_BROWSER_BACK | KEXT }, - { 0x6B, VK_LAUNCH_APP1 | KEXT }, - { 0x6C, VK_LAUNCH_MAIL | KEXT }, - { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, - { 0x1C, VK_RETURN | KEXT }, - { 0x46, VK_CANCEL | KEXT }, - { 0, 0 }, -}; - -ROSDATA VSC_VK extcode1_to_vk[] = { - { 0x1d, VK_PAUSE}, - { 0, 0 }, -}; - -ROSDATA VK_TO_BIT modifier_keys[] = { - { VK_SHIFT, KSHIFT }, - { VK_CONTROL, KCTRL }, - { VK_MENU, KALT }, - { 0, 0 } -}; - -ROSDATA MODIFIERS modifier_bits = { - modifier_keys, - 6, - { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ -}; - -#define NOCAPS 0 -#define CAPS KSHIFT /* Caps -> shift */ - -ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { - - /* The numbers */ - { '1', NOCAPS, {'1', '!'} }, - /* Ctrl-2 generates NUL */ - - /* Specials */ - { VK_OEM_4, NOCAPS, {WCH_DEAD, WCH_DEAD} }, - { VK_OEM_7, CAPS, {0xe4,0xc4} }, - { VK_OEM_3, CAPS, {0xf6, 0xd6} }, - - { VK_OEM_COMMA, CAPS, {',', ';'} }, - { VK_OEM_PERIOD, CAPS, {'.', ':'} }, - { VK_OEM_2, NOCAPS, {'\'', '*'} }, - - { VK_DECIMAL, NOCAPS, {',',','} }, - { VK_TAB, NOCAPS, {'\t', '\t'} }, - { VK_ADD, NOCAPS, {'+', '+'} }, - { VK_DIVIDE, NOCAPS, {'/', '/'} }, - { VK_MULTIPLY, NOCAPS, {'*', '*'} }, - { VK_SUBTRACT, NOCAPS, {'-', '-'} }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { - /* Normal, Shifted, Ctrl */ - - /* The alphabet */ - { 'A', CAPS, {'a', 'A', 0x01} }, - { 'B', CAPS, {'b', 'B', 0x02} }, - { 'C', CAPS, {'c', 'C', 0x03} }, - { 'D', CAPS, {'d', 'D', 0x04} }, - { 'F', CAPS, {'f', 'F', 0x06} }, - { 'G', CAPS, {'g', 'G', 0x07} }, - { 'H', CAPS, {'h', 'H', 0x08} }, - { 'I', CAPS, {'i', 'I', 0x09} }, - { 'J', CAPS, {'j', 'J', 0x0a} }, - { 'K', CAPS, {'k', 'K', 0x0b} }, - { 'L', CAPS, {'l', 'L', 0x0c} }, - { 'N', CAPS, {'n', 'N', 0x0e} }, - { 'O', CAPS, {'o', 'O', 0x0f} }, - { 'P', CAPS, {'p', 'P', 0x10} }, - { 'Q', CAPS, {'q', 'Q', 0x11} }, - { 'R', CAPS, {'r', 'R', 0x12} }, - { 'S', CAPS, {'s', 'S', 0x13} }, - { 'T', CAPS, {'t', 'T', 0x14} }, - { 'U', CAPS, {'u', 'U', 0x15} }, - { 'V', CAPS, {'v', 'V', 0x16} }, - { 'W', CAPS, {'w', 'W', 0x17} }, - { 'X', CAPS, {'x', 'X', 0x18} }, - { 'Y', CAPS, {'y', 'Y', 0x19} }, - { 'Z', CAPS, {'z', 'Z', 0x1a} }, - - /* Legacy (telnet-style) ascii escapes */ - {VK_OEM_6, CAPS, {0xe5,0xc5, 0x1d /* GS */} }, - { VK_OEM_5, NOCAPS, {0xa7,0xbd, 0x1c /* FS */} }, - { VK_OEM_MINUS, NOCAPS, {'-', '_', 0x1f /* US */} }, - { VK_RETURN,NOCAPS, {'\r', '\r', '\n'} }, - - { VK_BACK, NOCAPS, {'\b', '\b', 0x7f} }, - { VK_ESCAPE, NOCAPS, {0x1b, 0x1b, 0x1b} }, - { VK_SPACE, NOCAPS, {' ', ' ', ' '} }, - { VK_CANCEL, NOCAPS, {0x03, 0x03, 0x03} }, - - { 0,0 } -}; - -ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { - /* Normal, Shifted, Ctrl, Ctrl-Alt */ - /* Legacy Ascii generators */ - - { '2', NOCAPS, {'2', '\"', WCH_NONE,'@'} }, - { '3', NOCAPS, {'3', '#', WCH_NONE, 0x00a3} }, - { '4', NOCAPS, {'4', 0xa4, WCH_NONE, '$'} }, - { '5', NOCAPS, {'5', '%', WCH_NONE, 0x00ac} }, - { '7', NOCAPS, {'7', '/', WCH_NONE, '{'} }, - { '8', NOCAPS, {'8', '(', WCH_NONE, '['} }, - { '9', NOCAPS, {'9', ')', WCH_NONE, ']'} }, - { '0', NOCAPS, {'0', '=', WCH_NONE, '}'} }, - { VK_OEM_PLUS ,NOCAPS, {'+', '?', WCH_NONE, '\\'} }, - { 'E', CAPS, {'e', 'E' , 0x05, 0x00ac} }, - { VK_OEM_1 ,NOCAPS, {0xa8, '^', 0x001d, '~'} }, - { 'M', CAPS, {'m', 'M', 0x0d, 0x00b5} }, - {VK_OEM_102, NOCAPS, {'<', '>' ,0x001c,'|'} }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { - /* Normal, Shifted, Ctrl, Ctrl-Alt, C-S-x */ - { '6', NOCAPS, {'6', '&', WCH_NONE, WCH_NONE, 0x1e /* RS */} }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { - { VK_DECIMAL, 0, {'.'} }, - { VK_NUMPAD0, 0, {'0'} }, - { VK_NUMPAD1, 0, {'1'} }, - { VK_NUMPAD2, 0, {'2'} }, - { VK_NUMPAD3, 0, {'3'} }, - { VK_NUMPAD4, 0, {'4'} }, - { VK_NUMPAD5, 0, {'5'} }, - { VK_NUMPAD6, 0, {'6'} }, - { VK_NUMPAD7, 0, {'7'} }, - { VK_NUMPAD8, 0, {'8'} }, - { VK_NUMPAD9, 0, {'9'} }, - { 0,0 } -}; - -#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } - -ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { - vk_master(3,key_to_chars_3mod), - vk_master(4,key_to_chars_4mod), - vk_master(5,key_to_chars_5mod), - vk_master(2,key_to_chars_2mod), - vk_master(1,keypad_numbers), - { 0,0,0 } -}; - -ROSDATA VSC_LPWSTR key_names[] = { - { 0x00, L"" }, - { 0x01, L"ESC" }, - { 0x0e, L"BACKSTEG" }, - { 0x0f, L"TAB" }, - { 0x1c, L"RETUR" }, - { 0x1d, L"CTRL" }, - { 0x2a, L"SKIFT" }, - { 0x36, L"H\x00D6GER SKIFT" }, - { 0x37, L"NUM * (Numerisk tangent)" }, - { 0x38, L"ALT" }, - { 0x39, L"BLANKSTEG" }, - { 0x3a, L"CAPS LOCK" }, - { 0x3b, L"F1" }, - { 0x3c, L"F2" }, - { 0x3d, L"F3" }, - { 0x3e, L"F4" }, - { 0x3f, L"F5" }, - { 0x40, L"F6" }, - { 0x41, L"F7" }, - { 0x42, L"F8" }, - { 0x43, L"F9" }, - { 0x44, L"F10" }, - { 0x45, L"PAUSE" }, - { 0x46, L"SCROLL LOCK" }, - { 0x47, L"7 (Numerisk tangent)" }, - { 0x48, L"8 (Numerisk tangent)" }, - { 0x49, L"9 (Numerisk tangent)" }, - { 0x4a, L"- (Numerisk tangent)" }, - { 0x4b, L"4 (Numerisk tangent)" }, - { 0x4c, L"5 (Numerisk tangent)" }, - { 0x4d, L"6 (Numerisk tangent)" }, - { 0x4e, L"+ (Numerisk tangent)" }, - { 0x4f, L"1 (Numerisk tangent)" }, - { 0x50, L"2 (Numerisk tangent)" }, - { 0x51, L"3 (Numerisk tangent)" }, - { 0x52, L"0 (Numerisk tangent)" }, - { 0x53, L"DECIMAL (Numerisk tangent)" }, - { 0x54, L"Sys Req" }, - { 0x57, L"F11" }, - { 0x58, L"F12" }, - { 0x7c, L"F13" }, - { 0x7d, L"F14" }, - { 0x7e, L"F15" }, - { 0x7f, L"F16" }, - { 0x80, L"F17" }, - { 0x81, L"F18" }, - { 0x82, L"F19" }, - { 0x83, L"F20" }, - { 0x84, L"F21" }, - { 0x85, L"F22" }, - { 0x86, L"F23" }, - { 0x87, L"F24" }, - { 0, NULL } -}; - -ROSDATA VSC_LPWSTR extended_key_names[] = { - { 0x1c, L"RETUR (Numerisk tangent)" }, - { 0x1d, L"H\x00D6GER CTRL" }, - { 0x35, L"DIVISION (Numerisk tangent)" }, - { 0x37, L"PRINT SCREEN" }, - { 0x38, L"H\x00D6GER ALT" }, - { 0x45, L"NUM LOCK" }, - { 0x46, L"BREAK" }, - { 0x47, L"HOME" }, - { 0x48, L"UPPIL" }, - { 0x49, L"PAGE UP" }, - { 0x4b, L"V\x00C4NSTER PIL" }, -//{ 0x4c, L"Center" }, - { 0x4d, L"H\x00D6GER PIL" }, - { 0x4f, L"END" }, - { 0x50, L"NEDPIL" }, - { 0x51, L"PAGE DOWN" }, - { 0x52, L"INS" }, - { 0x53, L"DEL" }, - { 0x54, L"<ReactOS>" }, - { 0x56, L"HELP" }, - { 0x5b, L"V\x00C4NSTER <ReactOS>" }, - { 0x5c, L"H\x00D6GER <ReactOS>" }, - { 0x5d, L"Program" }, - { 0, NULL } -}; - -ROSDATA DEADKEY_LPWSTR dead_key_names[] = { - L"\x00a8" L"Omljud", - L"\x005e" L"Cirkumflex", - L"\x007e" L"Tilde", - L"\x00b4" L"Akut", - L"\x0060" L"Grav", - NULL -}; - -#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags - -ROSDATA DEADKEY dead_key[] = { - { DEADTRANS(0x0061, 0x00a8, 0x00e4, 0x0000) }, - { DEADTRANS(0x0065, 0x00a8, 0x00eb, 0x0000) }, - { DEADTRANS(0x0069, 0x00a8, 0x00ef, 0x0000) }, - { DEADTRANS(0x006f, 0x00a8, 0x00f6, 0x0000) }, - { DEADTRANS(0x0075, 0x00a8, 0x00fc, 0x0000) }, - { DEADTRANS(0x0079, 0x00a8, 0x00ff, 0x0000) }, - { DEADTRANS(0x0041, 0x00a8, 0x00c4, 0x0000) }, - { DEADTRANS(0x0045, 0x00a8, 0x00cb, 0x0000) }, - { DEADTRANS(0x0049, 0x00a8, 0x00cf, 0x0000) }, - { DEADTRANS(0x004f, 0x00a8, 0x00d6, 0x0000) }, - { DEADTRANS(0x0055, 0x00a8, 0x00dc, 0x0000) }, - { DEADTRANS(0x0020, 0x00a8, 0x00a8, 0x0000) }, - - { DEADTRANS(0x0061, 0x005e, 0x00e2, 0x0000) }, - { DEADTRANS(0x0065, 0x005e, 0x00ea, 0x0000) }, - { DEADTRANS(0x0069, 0x005e, 0x00ee, 0x0000) }, - { DEADTRANS(0x006f, 0x005e, 0x00f4, 0x0000) }, - { DEADTRANS(0x0075, 0x005e, 0x00fb, 0x0000) }, - { DEADTRANS(0x0041, 0x005e, 0x00c2, 0x0000) }, - { DEADTRANS(0x0045, 0x005e, 0x00ca, 0x0000) }, - { DEADTRANS(0x0049, 0x005e, 0x00ce, 0x0000) }, - { DEADTRANS(0x004f, 0x005e, 0x00d4, 0x0000) }, - { DEADTRANS(0x0055, 0x005e, 0x00db, 0x0000) }, - { DEADTRANS(0x0020, 0x005e, 0x005e, 0x0000) }, - - { DEADTRANS(0x0061, 0x007e, 0x00e3, 0x0000) }, - { DEADTRANS(0x006f, 0x007e, 0x00f5, 0x0000) }, - { DEADTRANS(0x006e, 0x007e, 0x00f1, 0x0000) }, - { DEADTRANS(0x0041, 0x007e, 0x00c3, 0x0000) }, - { DEADTRANS(0x004f, 0x007e, 0x00d5, 0x0000) }, - { DEADTRANS(0x004e, 0x007e, 0x00d1, 0x0000) }, - { DEADTRANS(0x0020, 0x007e, 0x007e, 0x0000) }, - - { DEADTRANS(0x0061, 0x00b4, 0x00e1, 0x0000) }, - { DEADTRANS(0x0065, 0x00b4, 0x00e9, 0x0000) }, - { DEADTRANS(0x0069, 0x00b4, 0x00ed, 0x0000) }, - { DEADTRANS(0x006f, 0x00b4, 0x00f3, 0x0000) }, - { DEADTRANS(0x0075, 0x00b4, 0x00fa, 0x0000) }, - { DEADTRANS(0x0079, 0x00b4, 0x00fd, 0x0000) }, - { DEADTRANS(0x0041, 0x00b4, 0x00c1, 0x0000) }, - { DEADTRANS(0x0045, 0x00b4, 0x00c9, 0x0000) }, - { DEADTRANS(0x0049, 0x00b4, 0x00cd, 0x0000) }, - { DEADTRANS(0x004f, 0x00b4, 0x00d3, 0x0000) }, - { DEADTRANS(0x0055, 0x00b4, 0x00da, 0x0000) }, - { DEADTRANS(0x0059, 0x00b4, 0x00dd, 0x0000) }, - { DEADTRANS(0x0020, 0x00b4, 0x00b4, 0x0000) }, - - { DEADTRANS(0x0061, 0x0060, 0x00e0, 0x0000) }, - { DEADTRANS(0x0065, 0x0060, 0x00e8, 0x0000) }, - { DEADTRANS(0x0069, 0x0060, 0x00ec, 0x0000) }, - { DEADTRANS(0x006f, 0x0060, 0x00f2, 0x0000) }, - { DEADTRANS(0x0075, 0x0060, 0x00f9, 0x0000) }, - { DEADTRANS(0x0041, 0x0060, 0x00c0, 0x0000) }, - { DEADTRANS(0x0045, 0x0060, 0x00c8, 0x0000) }, - { DEADTRANS(0x0049, 0x0060, 0x00cc, 0x0000) }, - { DEADTRANS(0x004f, 0x0060, 0x00d2, 0x0000) }, - { DEADTRANS(0x0055, 0x0060, 0x00d9, 0x0000) }, - { DEADTRANS(0x0020, 0x0060, 0x0060, 0x0000) }, - { 0, 0 } -}; - -/* Finally, the master table */ -ROSDATA KBDTABLES keyboard_layout_table = { - /* modifier assignments */ - &modifier_bits, - - /* character from vk tables */ - vk_to_wchar_master_table, - - /* diacritical marks -- currently implemented by wine code */ - dead_key, - - /* Key names */ - (VSC_LPWSTR *)key_names, - (VSC_LPWSTR *)extended_key_names, - dead_key_names, /* Dead key names */ - - /* scan code to virtual key maps */ - scancode_to_vk, - sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), - extcode0_to_vk, - extcode1_to_vk, - - MAKELONG(1,1), /* Version 1.0 */ - - /* Ligatures -- German doesn't have any */ - 0, - 0, - NULL -}; - -PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { - return &keyboard_layout_table; -} - -INT STDCALL -DllMain( - PVOID hinstDll, - ULONG dwReason, - PVOID reserved) -{ - return 1; -} - Removed: trunk/reactos/dll/keyboard/kbdsw/kbdse.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdse/kbdse.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsw/kbdse.def (original) +++ trunk/reactos/dll/keyboard/kbdsw/kbdse.def (removed) @@ -1,8 +1,0 @@ -; -; ReactOS Operating System -; -LIBRARY kbdse.dll - -EXPORTS -KbdLayerDescriptor -;EOF Removed: trunk/reactos/dll/keyboard/kbdsw/kbdse.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdse/kbdse.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsw/kbdse.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdsw/kbdse.rbuild (removed) @@ -1,9 +1,0 @@ -<module name="kbdse" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdse.dll" allowwarnings="true"> - <importlibrary definition="kbdse.def" /> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> - <define name="_WIN32_WINNT">0x0500</define> - <file>kbdse.c</file> - <file>kbdse.rc</file> -</module> Removed: trunk/reactos/dll/keyboard/kbdsw/kbdse.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdse/kbdse.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsw/kbdse.rc (original) +++ trunk/reactos/dll/keyboard/kbdsw/kbdse.rc (removed) @@ -1,5 +1,0 @@ -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS SEAscii Keyboard Layout\0" -#define REACTOS_STR_INTERNAL_NAME "kbdse\0" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdse.dll\0" -#include <reactos/version.rc> Copied: trunk/reactos/dll/keyboard/kbdsw/kbdsw.rbuild (from r25798, trunk/reactos/dll/keyboard/kbdse/kbdse.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsw/kbdsw.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdse/kbdse.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdsw/kbdsw.rbuild Fri Feb 23 21:41:48 2007 @@ -1,9 +1,9 @@ -<module name="kbdse" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdse.dll" allowwarnings="true"> - <importlibrary definition="kbdse.def" /> +<module name="kbdsw" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdsw.dll" allowwarnings="true"> + <importlibrary definition="kbdsw.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> - <file>kbdse.c</file> - <file>kbdse.rc</file> + <file>kbdsw.c</file> + <file>kbdsw.rc</file> </module> Modified: trunk/reactos/dll/keyboard/keyboard.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/keyboard.rbui… ============================================================================== --- trunk/reactos/dll/keyboard/keyboard.rbuild (original) +++ trunk/reactos/dll/keyboard/keyboard.rbuild Fri Feb 23 21:41:48 2007 @@ -29,8 +29,8 @@ <directory name="kbdru"> <xi:include href="kbdru/kbdru.rbuild" /> </directory> - <directory name="kbdse"> - <xi:include href="kbdse/kbdse.rbuild" /> + <directory name="kbdsw"> + <xi:include href="kbdsw/kbdsw.rbuild" /> </directory> <directory name="kbdsg"> <xi:include href="kbdsg/kbdsg.rbuild" />

1 0

[ion] 25892: - Load the driver image file with OBJ_KERNEL_HANDLE, and don't use FILE_SYNCHRONOUSIO_NONALERT, since we can use async access since the data is now being mapped instead of read.
by ion＠svn.reactos.org 23 Feb '07

23 Feb '07

Author: ion Date: Fri Feb 23 18:35:14 2007 New Revision: 25892 URL: http://svn.reactos.org/svn/reactos?rev=25892&view=rev Log: - Load the driver image file with OBJ_KERNEL_HANDLE, and don't use FILE_SYNCHRONOUSIO_NONALERT, since we can use async access since the data is now being mapped instead of read. Modified: trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Fri Feb 23 18:35:14 2007 @@ -1576,7 +1576,7 @@ /* Setup image attributes */ InitializeObjectAttributes(&ObjectAttributes, FileName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); @@ -1586,7 +1586,7 @@ &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_DELETE, - FILE_SYNCHRONOUS_IO_NONALERT); + 0); if (!NT_SUCCESS(Status)) goto Quickie; /* Validate it */

1 0

[ion] 25891: - Add a new member to MM_IMAGE_SECTION_OBJECT to hold the size of the mapped image file. - Finally load driver images like human beings, as actual image section objects instead of random memory that we allocate and manually "load" using unsafe and crappy PE memory copies. We now use KJK's integer-safe and properly documented/implemented loader for image sections that is already used for processes and other user-mode images. - Implement MiLoadImageSection for the task above and remov
by ion＠svn.reactos.org 23 Feb '07

23 Feb '07

Author: ion Date: Fri Feb 23 18:31:45 2007 New Revision: 25891 URL: http://svn.reactos.org/svn/reactos?rev=25891&view=rev Log: - Add a new member to MM_IMAGE_SECTION_OBJECT to hold the size of the mapped image file. - Finally load driver images like human beings, as actual image section objects instead of random memory that we allocate and manually "load" using unsafe and crappy PE memory copies. We now use KJK's integer-safe and properly documented/implemented loader for image sections that is already used for processes and other user-mode images. - Implement MiLoadImageSection for the task above and remove all the deprecated code that did the previous hackloading. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Fri Feb 23 18:31:45 2007 @@ -191,6 +191,7 @@ USHORT Machine; BOOLEAN Executable; ULONG NrSegments; + ULONG ImageSize; PMM_SECTION_SEGMENT Segments; } MM_IMAGE_SECTION_OBJECT, *PMM_IMAGE_SECTION_OBJECT; Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Fri Feb 23 18:31:45 2007 @@ -4560,6 +4560,8 @@ } } + ImageSectionObject->ImageSize = ImageSize; + /* Check there is enough space to map the section at that point. */ if (MmLocateMemoryAreaByRegion(AddressSpace, (PVOID)ImageBase, PAGE_ROUND_UP(ImageSize)) != NULL) Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Fri Feb 23 18:31:45 2007 @@ -18,8 +18,101 @@ KSPIN_LOCK PsLoadedModuleSpinLock; PVOID PsNtosImageBase; KMUTANT MmSystemLoadLock; +extern ULONG NtGlobalFlag; /* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +MiLoadImageSection(IN OUT PVOID *SectionPtr, + OUT PVOID *ImageBase, + IN PUNICODE_STRING FileName, + IN BOOLEAN SessionLoad, + IN PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + PROS_SECTION_OBJECT Section = *SectionPtr; + NTSTATUS Status; + PEPROCESS Process; + PVOID Base = NULL; + SIZE_T ViewSize = 0; + KAPC_STATE ApcState; + LARGE_INTEGER SectionOffset = {{0}}; + BOOLEAN LoadSymbols = FALSE; + ULONG DriverSize; + PVOID DriverBase; + PAGED_CODE(); + + /* Detect session load */ + if (SessionLoad) + { + /* Fail */ + DPRINT1("Session loading not yet supported!\n"); + while (TRUE); + } + + /* Not session load, shouldn't have an entry */ + ASSERT(LdrEntry == NULL); + + /* Attach to the system process */ + KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); + + /* Check if we need to load symbols */ + if (NtGlobalFlag & FLG_ENABLE_KDEBUG_SYMBOL_LOAD) + { + /* Yes we do */ + LoadSymbols = TRUE; + NtGlobalFlag &= ~FLG_ENABLE_KDEBUG_SYMBOL_LOAD; + } + + /* Map the driver */ + Process = PsGetCurrentProcess(); + Status = MmMapViewOfSection(Section, + Process, + &Base, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewUnmap, + 0, + PAGE_EXECUTE); + + /* Re-enable the flag */ + if (LoadSymbols) NtGlobalFlag |= FLG_ENABLE_KDEBUG_SYMBOL_LOAD; + + /* Check if we failed with distinguished status code */ + if (Status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) + { + /* Change it to something more generic */ + Status = STATUS_INVALID_IMAGE_FORMAT; + } + + /* Now check if we failed */ + if (!NT_SUCCESS(Status)) + { + /* Detach and return */ + KeUnstackDetachProcess(&ApcState); + return Status; + } + + /* Get the driver size */ + DriverSize = Section->ImageSection->ImageSize; + + /* Allocate a virtual section for the module */ + DriverBase = MmAllocateSection(DriverSize, NULL); + *ImageBase = DriverBase; + + /* Copy the image */ + RtlCopyMemory(DriverBase, Base, DriverSize); + + /* Now unmap the view */ + Status = MmUnmapViewOfSection(Process, Base); + ASSERT(NT_SUCCESS(Status)); + + /* Detach and return status */ + KeUnstackDetachProcess(&ApcState); + return Status; +} NTSTATUS NTAPI @@ -1331,11 +1424,7 @@ NTSTATUS Status; HANDLE FileHandle = NULL; OBJECT_ATTRIBUTES ObjectAttributes; - FILE_STANDARD_INFORMATION FileStdInfo; IO_STATUS_BLOCK IoStatusBlock; - ULONG DriverSize = 0, Size, i; - PVOID DriverBase; - PIMAGE_SECTION_HEADER SectionHeaders; PIMAGE_NT_HEADERS NtHeader; UNICODE_STRING BaseName, BaseDirectory, PrefixName; PLDR_DATA_TABLE_ENTRY LdrEntry = NULL; @@ -1510,31 +1599,6 @@ goto Quickie; } - /* Get image size */ - Status = ZwQueryInformationFile(FileHandle, - &IoStatusBlock, - &FileStdInfo, - sizeof(FileStdInfo), - FileStandardInformation); - if (!NT_SUCCESS(Status)) goto Quickie; - - /* Allocate memory for image */ - ModuleLoadBase = ExAllocatePoolWithTag(NonPagedPool, - FileStdInfo.EndOfFile.u.LowPart, - TAG_DRIVER_MEM); - - /* Read the image */ - Status = ZwReadFile(FileHandle, - 0, - 0, - 0, - &IoStatusBlock, - ModuleLoadBase, - FileStdInfo.EndOfFile.u.LowPart, - 0, - 0); - if (!NT_SUCCESS(Status)) goto Quickie; - /* Check if this is a session-load */ if (Flags) { @@ -1591,61 +1655,19 @@ LdrEntry = NULL; } - /* We should have a valid module base */ - ASSERT(ModuleLoadBase != NULL); - - /* Get header pointers */ + /* Load the image */ + Status = MiLoadImageSection(&Section, + &ModuleLoadBase, + FileName, + FALSE, + NULL); + ASSERT(Status != STATUS_ALREADY_COMMITTED); + + /* Get the NT Header */ NtHeader = RtlImageNtHeader(ModuleLoadBase); - /* Get header pointers */ - SectionHeaders = IMAGE_FIRST_SECTION(NtHeader); - - /* Determine the size of the module */ - for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) - { - /* Skip this section if we're not supposed to load it */ - if (!(SectionHeaders[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) - { - /* Add the size of this section into the total size */ - Size = SectionHeaders[i].VirtualAddress + - SectionHeaders[i].Misc.VirtualSize; - DriverSize = max(DriverSize, Size); - } - } - - /* Round up the driver size to section alignment */ - DriverSize = ROUND_UP(DriverSize, NtHeader->OptionalHeader.SectionAlignment); - - /* Allocate a virtual section for the module */ - DriverBase = MmAllocateSection(DriverSize, NULL); - - /* Copy headers over */ - RtlCopyMemory(DriverBase, - ModuleLoadBase, - NtHeader->OptionalHeader.SizeOfHeaders); - - /* Copy image sections into virtual section */ - for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) - { - /* Get the size of this section and check if it's valid and on-disk */ - Size = SectionHeaders[i].VirtualAddress + - SectionHeaders[i].Misc.VirtualSize; - if ((Size <= DriverSize) && (SectionHeaders[i].SizeOfRawData)) - { - /* Copy the data from the disk to the image */ - RtlCopyMemory((PVOID)((ULONG_PTR)DriverBase + - SectionHeaders[i].VirtualAddress), - (PVOID)((ULONG_PTR)ModuleLoadBase + - SectionHeaders[i].PointerToRawData), - SectionHeaders[i].Misc.VirtualSize > - SectionHeaders[i].SizeOfRawData ? - SectionHeaders[i].SizeOfRawData : - SectionHeaders[i].Misc.VirtualSize); - } - } - /* Relocate the driver */ - Status = LdrRelocateImageWithBias(DriverBase, + Status = LdrRelocateImageWithBias(ModuleLoadBase, 0, "SYSLDR", STATUS_SUCCESS, @@ -1682,10 +1704,10 @@ } /* Setup the rest of the entry */ - LdrEntry->DllBase = DriverBase; - LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)DriverBase + + LdrEntry->DllBase = ModuleLoadBase; + LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)ModuleLoadBase + NtHeader->OptionalHeader.AddressOfEntryPoint); - LdrEntry->SizeOfImage = DriverSize; + LdrEntry->SizeOfImage = ((PROS_SECTION_OBJECT)Section)->ImageSection->ImageSize; LdrEntry->CheckSum = NtHeader->OptionalHeader.CheckSum; LdrEntry->SectionPointer = LdrEntry; @@ -1729,7 +1751,7 @@ /* Resolve imports */ MissingApiName = Buffer; - Status = MiResolveImageReferences(DriverBase, + Status = MiResolveImageReferences(ModuleLoadBase, &BaseDirectory, NULL, &MissingApiName, @@ -1762,9 +1784,6 @@ Quickie: /* If we have a file handle, close it */ if (FileHandle) ZwClose(FileHandle); - - /* Cleanup */ - if (ModuleLoadBase) ExFreePool(ModuleLoadBase); /* Check if we have the lock acquired */ if (LockOwned)

1 0

[tretiakov] 25890: Move primary language selection from Input Locale page to General page.
by tretiakov＠svn.reactos.org 23 Feb '07

23 Feb '07

Author: tretiakov Date: Fri Feb 23 12:35:32 2007 New Revision: 25890 URL: http://svn.reactos.org/svn/reactos?rev=25890&view=rev Log: Move primary language selection from Input Locale page to General page. Added: trunk/reactos/dll/cpl/intl/generalp.c - copied, changed from r25798, trunk/reactos/dll/cpl/intl/locale.c trunk/reactos/dll/cpl/intl/inplocale.c - copied, changed from r25798, trunk/reactos/dll/cpl/intl/general.c Removed: trunk/reactos/dll/cpl/intl/general.c trunk/reactos/dll/cpl/intl/locale.c Modified: trunk/reactos/dll/cpl/intl/Fr.rc trunk/reactos/dll/cpl/intl/Ja.rc trunk/reactos/dll/cpl/intl/cz.rc trunk/reactos/dll/cpl/intl/de.rc trunk/reactos/dll/cpl/intl/en.rc trunk/reactos/dll/cpl/intl/es.rc trunk/reactos/dll/cpl/intl/hu.rc trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/intl.rbuild trunk/reactos/dll/cpl/intl/it.rc trunk/reactos/dll/cpl/intl/nl.rc trunk/reactos/dll/cpl/intl/ru.rc trunk/reactos/dll/cpl/intl/sv.rc trunk/reactos/dll/cpl/intl/uk.rc Modified: trunk/reactos/dll/cpl/intl/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/Fr.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/Fr.rc (original) +++ trunk/reactos/dll/cpl/intl/Fr.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "Général" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Page de propriétés 1",-1,73,74,90,8 + GROUPBOX "Langue principale", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Sélectionnez la langue principale que vous voulez utiliser:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -86,10 +89,7 @@ CAPTION "Langues" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Langue principale", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Sélectionnez la langue principale que vous voulez utiliser:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Modified: trunk/reactos/dll/cpl/intl/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/Ja.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/Ja.rc (original) +++ trunk/reactos/dll/cpl/intl/Ja.rc Fri Feb 23 12:35:32 2007 @@ -5,7 +5,10 @@ CAPTION "SÊ" FONT 9, "MS UI Gothic" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "gp¾ê", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "gpµ½¢¾êÆnæÝèðIðµÄ¾³¢:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -83,10 +86,7 @@ CAPTION "üÍ¾ê" FONT 9, "MS UI Gothic" BEGIN - GROUPBOX "gp¾ê", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "gpµ½¢¾êÆnæÝèðIðµÄ¾³¢:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Modified: trunk/reactos/dll/cpl/intl/cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/cz.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/cz.rc (original) +++ trunk/reactos/dll/cpl/intl/cz.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "Obecné nastavení" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Výchozí jazyk", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Vyberte jazyk, ve kterém bude systém zobrazovat dialogy a hláení:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -85,10 +88,7 @@ CAPTION "Jazyky" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Výchozí jazyk", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Vyberte jazyk, ve kterém bude systém zobrazovat dialogy a hláení:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Modified: trunk/reactos/dll/cpl/intl/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/de.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/de.rc (original) +++ trunk/reactos/dll/cpl/intl/de.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Standardsprache", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Wählen Sie eine Sprache und Region aus welche Sie benutzen wollen:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -85,10 +88,7 @@ CAPTION "Regionale Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Standardsprache", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Wählen Sie eine Sprache und Region aus welche Sie benutzen wollen:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Modified: trunk/reactos/dll/cpl/intl/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/en.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/en.rc (original) +++ trunk/reactos/dll/cpl/intl/en.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Primary language", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Select the primary language and region you want to use:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -86,10 +89,7 @@ CAPTION "Input Locale" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Primary language", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Select the primary language and region you want to use:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Input Locale Page",-1,73,74,90,8 END Modified: trunk/reactos/dll/cpl/intl/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/es.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/es.rc (original) +++ trunk/reactos/dll/cpl/intl/es.rc Fri Feb 23 12:35:32 2007 @@ -11,7 +11,10 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Lenguaje Primario", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Seleccione el lenguaje primario y la región que desea usar:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -90,10 +93,7 @@ CAPTION "Localidad" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Lenguaje Primario", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Seleccione el lenguaje primario y la región que desea usar:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Removed: trunk/reactos/dll/cpl/intl/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/general.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/intl/general.c (original) +++ trunk/reactos/dll/cpl/intl/general.c (removed) @@ -1,51 +1,0 @@ -/* - * ReactOS - * Copyright (C) 2004 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. - */ -/* $Id$ - * - * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/general.c - * PURPOSE: General property page - * PROGRAMMER: Eric Kohl - */ - -#include <windows.h> -#include <commctrl.h> -#include <prsht.h> -#include <cpl.h> - -#include "intl.h" -#include "resource.h" - - -/* Property page dialog callback */ -INT_PTR CALLBACK -GeneralPageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - return FALSE; -} - -/* EOF */ Copied: trunk/reactos/dll/cpl/intl/generalp.c (from r25798, trunk/reactos/dll/cpl/intl/locale.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?p2… ============================================================================== --- trunk/reactos/dll/cpl/intl/locale.c (original) +++ trunk/reactos/dll/cpl/intl/generalp.c Fri Feb 23 12:35:32 2007 @@ -19,8 +19,8 @@ /* $Id$ * * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/locale.c - * PURPOSE: Locale property page + * FILE: lib/cpl/intl/generalp.c + * PURPOSE: General property page * PROGRAMMER: Eric Kohl * Klemens Friedl * Aleksey Bragin @@ -176,7 +176,7 @@ /* Property page dialog callback */ INT_PTR CALLBACK -LocalePageProc(HWND hwndDlg, +GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) Modified: trunk/reactos/dll/cpl/intl/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/hu.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/hu.rc (original) +++ trunk/reactos/dll/cpl/intl/hu.rc Fri Feb 23 12:35:32 2007 @@ -6,7 +6,10 @@ CAPTION "Általános" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "1. tulajdonságlap",-1,73,74,90,8 + GROUPBOX "Elsõdleges nyelv", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Válassza ki azt a nyelvet és földrajzi helyet, amit használni akar:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -85,10 +88,7 @@ CAPTION "Hely megadása" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Elsõdleges nyelv", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Válassza ki azt a nyelvet és földrajzi helyet, amit használni akar:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Copied: trunk/reactos/dll/cpl/intl/inplocale.c (from r25798, trunk/reactos/dll/cpl/intl/general.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/inplocale.c?p… ============================================================================== --- trunk/reactos/dll/cpl/intl/general.c (original) +++ trunk/reactos/dll/cpl/intl/inplocale.c Fri Feb 23 12:35:32 2007 @@ -19,8 +19,8 @@ /* $Id$ * * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/general.c - * PURPOSE: General property page + * FILE: lib/cpl/intl/inplocale.c + * PURPOSE: Input Locale property page * PROGRAMMER: Eric Kohl */ @@ -35,7 +35,7 @@ /* Property page dialog callback */ INT_PTR CALLBACK -GeneralPageProc(HWND hwndDlg, +InpLocalePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.c (original) +++ trunk/reactos/dll/cpl/intl/intl.c Fri Feb 23 12:35:32 2007 @@ -156,7 +156,7 @@ InitPropSheetPage(&psp[2], IDD_CURRENCYPAGE, CurrencyPageProc); InitPropSheetPage(&psp[3], IDD_TIMEPAGE, TimePageProc); InitPropSheetPage(&psp[4], IDD_DATEPAGE, DatePageProc); - InitPropSheetPage(&psp[5], IDD_LOCALEPAGE, LocalePageProc); + InitPropSheetPage(&psp[5], IDD_LOCALEPAGE, InpLocalePageProc); return (LONG)(PropertySheet(&psh) != -1); } Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h (original) +++ trunk/reactos/dll/cpl/intl/intl.h Fri Feb 23 12:35:32 2007 @@ -36,7 +36,7 @@ /* locale.c */ INT_PTR CALLBACK -LocalePageProc(HWND hwndDlg, +InpLocalePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); Modified: trunk/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rbuild (original) +++ trunk/reactos/dll/cpl/intl/intl.rbuild Fri Feb 23 12:35:32 2007 @@ -15,9 +15,9 @@ <library>msvcrt</library> <file>currency.c</file> <file>date.c</file> - <file>general.c</file> + <file>generalp.c</file> <file>intl.c</file> - <file>locale.c</file> + <file>inplocale.c</file> <file>numbers.c</file> <file>time.c</file> <file>intl.rc</file> Modified: trunk/reactos/dll/cpl/intl/it.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/it.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/it.rc (original) +++ trunk/reactos/dll/cpl/intl/it.rc Fri Feb 23 12:35:32 2007 @@ -8,7 +8,10 @@ CAPTION "Generale" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Pagina delle proprietà 1",-1,73,74,90,8 + GROUPBOX "Lingua principale", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Scegli la lingua principale e le opzioni regionali che intendi usare:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -87,10 +90,7 @@ CAPTION "Input Locale" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Lingua principale", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Scegli la lingua principale e le opzioni regionali che intendi usare:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Removed: trunk/reactos/dll/cpl/intl/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/locale.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/intl/locale.c (original) +++ trunk/reactos/dll/cpl/intl/locale.c (removed) @@ -1,237 +1,0 @@ -/* - * ReactOS - * Copyright (C) 2004, 2005 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. - */ -/* $Id$ - * - * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/locale.c - * PURPOSE: Locale property page - * PROGRAMMER: Eric Kohl - * Klemens Friedl - * Aleksey Bragin - */ - -#define WINVER 0x0501 - -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> - -#include <stdio.h> - -#include "intl.h" -#include "resource.h" - -HWND hList; - -BOOL CALLBACK LocalesEnumProc( - LPTSTR lpLocale // locale id -) -{ - LCID lcid; - TCHAR lang[255]; - int index; - - //swscanf(lpLocale, L"%lx", &lcid); // maybe use wcstoul? - lcid = wcstoul(lpLocale, NULL, 16); - - GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)); - - index = SendMessageW(hList, - CB_ADDSTRING, - 0, - (LPARAM)lang); - - SendMessageW(hList, - CB_SETITEMDATA, - index, - (LPARAM)lcid); - - return TRUE; -} - - -static VOID -CreateLanguagesList(HWND hwnd) -{ - TCHAR langSel[255]; - - hList = hwnd; - EnumSystemLocalesW(LocalesEnumProc, LCID_SUPPORTED); - - // Select current locale - GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SLANGUAGE, langSel, sizeof(langSel)); // or should it be System and not user? - - SendMessageW(hList, - CB_SELECTSTRING, - -1, - (LPARAM)langSel); -} - -// Sets new locale -void SetNewLocale(LCID lcid) -{ - // HKCU\\Control Panel\\International\\Locale = 0409 (type=0) - // HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","Default",0x00000000,"0409" (type=0) - // HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage",0x00000000,"0409" (type=0) - - // Set locale - HKEY localeKey; - HKEY langKey; - DWORD ret; - TCHAR value[9]; - DWORD valuesize; - WCHAR ACPPage[9]; - WCHAR OEMPage[9]; - - ret = GetLocaleInfoW(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTCODEPAGE, (WORD*)OEMPage, sizeof(OEMPage)); - if (ret == 0) - { - MessageBoxW(NULL, L"Problem reading OEM code page", L"Big Problem", MB_OK); - return; - } - - GetLocaleInfoW(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, (WORD*)ACPPage, sizeof(ACPPage)); - if (ret == 0) - { - MessageBoxW(NULL, L"Problem reading ANSI code page", L"Big Problem", MB_OK); - return; - } - - ret = RegOpenKeyW(HKEY_CURRENT_USER, L"Control Panel\\International", &localeKey); - - if (ret != ERROR_SUCCESS) - { - // some serious error - MessageBoxW(NULL, L"Problem opening HKCU\\Control Panel\\International key", L"Big Problem", MB_OK); - return; - } - - wsprintf(value, L"%04X", (DWORD)lcid); - valuesize = (wcslen(value) + 1) * sizeof(WCHAR); - - RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (BYTE *)value, valuesize); - RegCloseKey(localeKey); - - ret = RegOpenKeyW(HKEY_USERS, L".DEFAULT\\Control Panel\\International", &localeKey); - - if (ret != ERROR_SUCCESS) - { - // some serious error - MessageBoxW(NULL, L"Problem opening HKU\\.DEFAULT\\Control Panel\\International key", L"Big Problem", MB_OK); - return; - } - - wsprintf(value, L"%04X", (DWORD)lcid); - valuesize = (wcslen(value) + 1) * sizeof(WCHAR); - - RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (BYTE *)value, valuesize); - RegCloseKey(localeKey); - - // Set language - ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\NLS\\Language", &langKey); - - if (ret != ERROR_SUCCESS) - { - MessageBoxW(NULL, L"Problem opening HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language key", L"Big Problem", MB_OK); - return; - } - - RegSetValueExW(langKey, L"Default", 0, REG_SZ, (BYTE *)value, valuesize ); - RegSetValueExW(langKey, L"InstallLanguage", 0, REG_SZ, (BYTE *)value, valuesize ); - - RegCloseKey(langKey); - - - // Set language - ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage", &langKey); - - if (ret != ERROR_SUCCESS) - { - MessageBoxW(NULL, L"Problem opening HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage key", L"Big Problem", MB_OK); - return; - } - - RegSetValueExW(langKey, L"OEMCP", 0, REG_SZ, (BYTE *)OEMPage, (wcslen(OEMPage) +1 ) * sizeof(WCHAR) ); - RegSetValueExW(langKey, L"ACP", 0, REG_SZ, (BYTE *)ACPPage, (wcslen(ACPPage) +1 ) * sizeof(WCHAR) ); - - RegCloseKey(langKey); - -} - -/* Property page dialog callback */ -INT_PTR CALLBACK -LocalePageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - switch(uMsg) - { - case WM_INITDIALOG: - CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST)); - break; - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_LANGUAGELIST: - if (HIWORD(wParam) == CBN_SELCHANGE) - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } - break; - } - break; - - case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; - if (lpnm->code == (UINT)PSN_APPLY) - { - // Apply changes - LCID NewLcid; - int iCurSel; - - // Acquire new value - iCurSel = SendMessageW(hList, - CB_GETCURSEL, - 0, - 0); - if (iCurSel == CB_ERR) - break; - - NewLcid = SendMessageW(hList, - CB_GETITEMDATA, - iCurSel, - 0); - - if (NewLcid == (LCID)CB_ERR) - break; - - - // Actually set new locale - SetNewLocale(NewLcid); - } - } - break; - } - return FALSE; -} - - -/* EOF */ Modified: trunk/reactos/dll/cpl/intl/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/nl.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/nl.rc (original) +++ trunk/reactos/dll/cpl/intl/nl.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "Algemeen" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Eerste taal", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Selecteer uw eerste taal en regio die u wilt gebruiken:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -86,10 +89,7 @@ CAPTION "Invoer" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Eerste taal", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Selecteer uw eerste taal en regio die u wilt gebruiken:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Modified: trunk/reactos/dll/cpl/intl/ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/ru.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/ru.rc (original) +++ trunk/reactos/dll/cpl/intl/ru.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "Îáùèå" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Âêëàäêà 1",-1,73,74,90,8 + GROUPBOX "Îñíîâíîé ÿçûê", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Âûáåðèòå îñíîâíîé ÿçûê è ðåãèîí, êîòîðûé âû õîòèòå èñïîëüçîâàòü:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -86,10 +89,7 @@ CAPTION "ßçûêè è ðàñêëàäêè" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Îñíîâíîé ÿçûê", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Âûáåðèòå îñíîâíîé ÿçûê è ðåãèîí, êîòîðûé âû õîòèòå èñïîëüçîâàòü:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Modified: trunk/reactos/dll/cpl/intl/sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/sv.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/sv.rc (original) +++ trunk/reactos/dll/cpl/intl/sv.rc Fri Feb 23 12:35:32 2007 @@ -8,7 +8,10 @@ CAPTION "Generellt" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Primärt språk", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Välj det språk och den region du vill använda:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -87,10 +90,7 @@ CAPTION "Inmatningsspråk" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Primärt språk", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Välj det språk och den region du vill använda:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END Modified: trunk/reactos/dll/cpl/intl/uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/uk.rc?rev=258… ============================================================================== --- trunk/reactos/dll/cpl/intl/uk.rc (original) +++ trunk/reactos/dll/cpl/intl/uk.rc Fri Feb 23 12:35:32 2007 @@ -14,7 +14,10 @@ FONT 8, "MS Shell Dlg" EXSTYLE DS_SHELLFONT BEGIN - LTEXT "Âêëàäêà âëàñòèâîñòåé 1",-1,73,74,90,8 + GROUPBOX "Îñíîâíà ìîâà", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Âèáåð³òü ïåðâèííó ìîâó ³ ðåã³îí, ÿêèé âè áàæàºòå âèêîðèñòîâóâàòè:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -93,10 +96,7 @@ CAPTION "Ìîâè ³ ðîçêëàäêè" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Îñíîâíà ìîâà", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Âèáåð³òü ïåðâèííó ìîâó ³ ðåã³îí, ÿêèé âè áàæàºòå âèêîðèñòîâóâàòè:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END

1 0

[tretiakov] 25889: Update testapp
by tretiakov＠svn.reactos.org 23 Feb '07

23 Feb '07

Author: tretiakov Date: Fri Feb 23 11:56:32 2007 New Revision: 25889 URL: http://svn.reactos.org/svn/reactos?rev=25889&view=rev Log: Update testapp Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/ (props changed) trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h Propchange: trunk/reactos/base/applications/testsets/user32/kbdlayout/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Feb 23 11:56:32 2007 @@ -3,3 +3,5 @@ *.plg *.opt *.ncb +*.aps + Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c (original) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.c Fri Feb 23 11:56:32 2007 @@ -25,20 +25,28 @@ WCHAR WndName[25]; } WND_DATA; -INT WINAPI WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) -{ - - - hInst = hInstance; +DWORD WINAPI ThreadProc(LPVOID lpParam) +{ DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_MAINDIALOG), NULL, (DLGPROC)MainDialogProc, (LPARAM)NULL); + + return 0; +} + +INT WINAPI WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpCmdLine, + int nCmdShow) +{ + + + hInst = hInstance; + + ThreadProc(0); return 0; } @@ -148,11 +156,11 @@ if(IsDlgButtonChecked(hDlg, IDC_KLF_REORDER)) ret |= KLF_REORDER; -/* if(IsDlgButtonChecked(hDlg, IDC_KLF_RESET)) + if(IsDlgButtonChecked(hDlg, IDC_KLF_RESET)) ret |= KLF_RESET; if(IsDlgButtonChecked(hDlg, IDC_KLF_SHIFTLOCK)) - ret |= KLF_SHIFTLOCK;*/ + ret |= KLF_SHIFTLOCK; if(IsDlgButtonChecked(hDlg, IDC_KLF_SETFORPROCESS)) ret |= KLF_SETFORPROCESS; @@ -201,14 +209,6 @@ if(IsDlgButtonChecked(hDlg, IDC_FROMLIST)) return GetSelectedLayout(hDlg); - else if(IsDlgButtonChecked(hDlg, IDC_FROMEDIT)) - { - WCHAR buf[25]; - ULONG kl; - GetWindowText(GetDlgItem(hDlg, IDC_HANDLE), buf, 25); - swscanf(buf, L"%x", &kl); - return (HKL) kl; - } else if(IsDlgButtonChecked(hDlg, IDC_HKL_NEXT)) return (HKL)HKL_NEXT; @@ -232,21 +232,24 @@ { case WM_INITDIALOG: { + WCHAR Buf[255]; UpdateData(hDlg); hMainDlg = hDlg; SubclassWnd(GetDlgItem(hDlg, IDC_LIST), L"List"); SubclassWnd(GetDlgItem(hDlg, IDC_EDIT1), L"Edit1"); - SubclassWnd(GetDlgItem(hDlg, IDC_EDIT2), L"Edit2"); SubclassWnd(GetDlgItem(hDlg, IDC_KLID), L"Klid"); - SubclassWnd(GetDlgItem(hDlg, IDC_HANDLE), L"Handle"); SubclassWnd(GetDlgItem(hDlg, ID_CANCEL), L"CancelB"); SubclassWnd(GetDlgItem(hDlg, IDC_ACTIVATE), L"ActivateB"); SubclassWnd(GetDlgItem(hDlg, IDC_REFRESH), L"RefreshB"); SubclassWnd(GetDlgItem(hDlg, IDC_UNLOAD), L"UnloadB"); + SubclassWnd(GetDlgItem(hDlg, IDC_LOAD), L"LoadB"); CheckRadioButton(hDlg, IDC_FROMLIST, IDC_FROMEDIT, IDC_FROMLIST); SetWindowText(GetDlgItem(hDlg, IDC_KLID), L"00000419"); + + swprintf(Buf, L"Current thread id: %d", GetCurrentThreadId()); + SetWindowText(GetDlgItem(hDlg, IDC_CURTHREAD), Buf); return 0; } /* WM_INITDIALOG */ @@ -308,6 +311,15 @@ break; } + case IDC_NEWTHREAD: + { + if(!CreateThread(NULL, 0, ThreadProc, NULL, 0, NULL)) + { + FormatBox(hDlg, MB_ICONERROR, L"Error!", + L"Can not create thread (%d).", GetLastError()); + } + } + case IDC_LIST: { if(HIWORD(wParam) == LBN_SELCHANGE) Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc (original) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/kbdlayout.rc Fri Feb 23 11:56:32 2007 @@ -26,56 +26,55 @@ // Dialog // -IDD_MAINDIALOG DIALOG DISCARDABLE 0, 0, 403, 223 -STYLE DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU +IDD_MAINDIALOG DIALOG DISCARDABLE 0, 0, 327, 194 +STYLE DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU CAPTION "Keyboard layout test" FONT 8, "MS Sans Serif" BEGIN - PUSHBUTTON "Exit",ID_CANCEL,138,202,121,14 - EDITTEXT IDC_EDIT1,7,140,195,58,ES_MULTILINE | ES_AUTOHSCROLL - LISTBOX IDC_LIST,185,17,101,87,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | + PUSHBUTTON "Close",ID_CANCEL,215,172,105,14 + EDITTEXT IDC_EDIT1,7,140,199,47,ES_MULTILINE | ES_AUTOHSCROLL + LISTBOX IDC_LIST,124,17,84,89,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - LTEXT "Loaded layouts",IDC_STATIC,190,7,49,8 - LTEXT "Active layout:",IDC_ACTIVE,7,127,173,10,SS_SUNKEN - EDITTEXT IDC_EDIT2,206,140,190,58,ES_MULTILINE | ES_AUTOHSCROLL - PUSHBUTTON "Unload",IDC_UNLOAD,186,105,48,14 - PUSHBUTTON "Activate",IDC_ACTIVATE,237,121,47,14 - GROUPBOX "Activate Flags",IDC_STATIC,293,7,103,67 + LTEXT "Loaded layouts",IDC_STATIC,128,7,49,8 + LTEXT "Active layout:",IDC_ACTIVE,7,127,114,10,SS_SUNKEN + PUSHBUTTON "Unload",IDC_UNLOAD,124,109,41,14 + PUSHBUTTON "Activate",IDC_ACTIVATE,166,109,41,14 + GROUPBOX "Activate Flags",IDC_STATIC,215,7,103,67 CONTROL "KLF_REORDER",IDC_KLF_REORDER,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,299,22,69,10 + WS_TABSTOP,221,22,69,10 CONTROL "KLF_RESET",IDC_KLF_RESET,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,299,34,66,12 + WS_TABSTOP,221,34,66,12 CONTROL "KLF_SETFORPROCESS",IDC_KLF_SETFORPROCESS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,299,48,95,10 + BS_AUTOCHECKBOX | WS_TABSTOP,221,48,95,10 CONTROL "KLF_SHIFTLOCK",IDC_KLF_SHIFTLOCK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,299,60,72,10 - GROUPBOX "Activate layout",IDC_STATIC,294,77,101,60 + BS_AUTOCHECKBOX | WS_TABSTOP,221,60,72,10 + GROUPBOX "Activate layout",IDC_STATIC,216,77,103,50 CONTROL "From list",IDC_FROMLIST,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,298,90,41,10 - CONTROL "HKL_NEXT",IDC_HKL_NEXT,"Button",BS_AUTORADIOBUTTON,298, + WS_GROUP,220,90,41,10 + CONTROL "HKL_NEXT",IDC_HKL_NEXT,"Button",BS_AUTORADIOBUTTON,220, 101,53,10 - CONTROL "HKL_PREV",IDC_HKL_PREV,"Button",BS_AUTORADIOBUTTON,298, + CONTROL "HKL_PREV",IDC_HKL_PREV,"Button",BS_AUTORADIOBUTTON,220, 112,53,10 - CONTROL "From edit",IDC_FROMEDIT,"Button",BS_AUTORADIOBUTTON,298, - 124,45,10 - GROUPBOX "Load layout",IDC_STATIC,7,7,173,118 + GROUPBOX "Load layout",IDC_STATIC,7,7,113,118 CONTROL "KLF_ACTIVATE",IDL_KLF_ACTIVATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,15,42,67,10 + WS_TABSTOP,14,44,67,10 CONTROL "KLF_NOTELLSHELL",IDL_KLF_NOTELLSHELL,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,55,83,10 - LTEXT "pwszKLID:",IDC_STATIC,15,22,35,8 - EDITTEXT IDC_KLID,53,21,64,14,ES_AUTOHSCROLL | ES_NUMBER + BS_AUTOCHECKBOX | WS_TABSTOP,14,57,83,10 + LTEXT "pwszKLID:",IDC_STATIC,14,17,35,8 + EDITTEXT IDC_KLID,14,27,54,14,ES_AUTOHSCROLL CONTROL "KLF_REORDER",IDL_KLF_REORDER,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,15,68,69,10 + WS_TABSTOP,14,71,69,10 CONTROL "KLF_REPLACELANG",IDL_KLF_REPLACELANG,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,81,85,10 + BS_AUTOCHECKBOX | WS_TABSTOP,14,84,85,10 CONTROL "KLF_SUBSTITUTE_OK",IDL_KLF_SUBSTITUTE_OK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,94,92,10 + BS_AUTOCHECKBOX | WS_TABSTOP,14,97,92,10 CONTROL "KLF_SETFORPROCESS",IDL_KLF_SETFORPROCESS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,107,95,10 - PUSHBUTTON "Load",IDC_LOAD,125,21,50,14 - PUSHBUTTON "Refresh",IDC_REFRESH,237,106,48,14 - EDITTEXT IDC_HANDLE,185,122,49,14,ES_AUTOHSCROLL + BS_AUTOCHECKBOX | WS_TABSTOP,14,110,95,10 + PUSHBUTTON "Load",IDC_LOAD,71,27,46,14 + PUSHBUTTON "Refresh",IDC_REFRESH,124,124,83,12 + GROUPBOX "Multithreading",IDC_STATIC,216,130,104,39 + LTEXT "Current thread ID:",IDC_CURTHREAD,219,141,93,8 + PUSHBUTTON "Create new thread",IDC_NEWTHREAD,234,152,71,12 END @@ -90,9 +89,9 @@ IDD_MAINDIALOG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 396 + RIGHTMARGIN, 320 TOPMARGIN, 7 - BOTTOMMARGIN, 216 + BOTTOMMARGIN, 187 END END #endif // APSTUDIO_INVOKED @@ -123,7 +122,6 @@ #endif // APSTUDIO_INVOKED - #endif // Russian resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/testsets… ============================================================================== --- trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h (original) +++ trunk/reactos/base/applications/testsets/user32/kbdlayout/resource.h Fri Feb 23 11:56:32 2007 @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. -// Used by lab17.rc +// Used by kbdlayout.rc // #define IDD_MAINDIALOG 101 #define ID_CANCEL 1000 @@ -29,6 +29,8 @@ #define IDC_LOAD 1043 #define IDC_REFRESH 1044 #define IDC_HANDLE 1046 +#define IDC_CURTHREAD 1049 +#define IDC_NEWTHREAD 1050 // Next default values for new objects // @@ -37,7 +39,7 @@ #define _APS_NO_MFC 1 #define _APS_NEXT_RESOURCE_VALUE 105 #define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1049 +#define _APS_NEXT_CONTROL_VALUE 1051 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif

1 0

[tretiakov] 25888: Add KLF_SHIFTLOCK and KLF_RESET
by tretiakov＠svn.reactos.org 23 Feb '07

23 Feb '07

Author: tretiakov Date: Fri Feb 23 11:21:29 2007 New Revision: 25888 URL: http://svn.reactos.org/svn/reactos?rev=25888&view=rev Log: Add KLF_SHIFTLOCK and KLF_RESET Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Fri Feb 23 11:21:29 2007 @@ -89,10 +89,16 @@ #define KLF_REPLACELANG 16 #define KLF_NOTELLSHELL 128 #define KLF_SETFORPROCESS 256 +#if (_WIN32_WINNT >= 0x0500) +#define KLF_SHIFTLOCK 65535 +#define KLF_RESET 0x40000000 +#endif /*(_WIN32_WINNT >= 0x0500) */ #define KL_NAMELENGTH 9 +#if (WINVER >= 0x0500) #define INPUTLANGCHANGE_BACKWARD 4 #define INPUTLANGCHANGE_FORWARD 2 #define INPUTLANGCHANGE_SYSCHARSET 1 +#endif /* (WINVER >= 0x0500) */ #define MF_ENABLED 0 #define MF_GRAYED 1 #define MF_DISABLED 2

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs