Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 31652: - Fix buffer overflows
by dchapyshev＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: dchapyshev Date: Mon Jan 7 23:07:09 2008 New Revision: 31652 URL: http://svn.reactos.org/svn/reactos?rev=31652&view=rev Log: - Fix buffer overflows Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Mon Jan 7 23:07:09 2008 @@ -816,27 +816,26 @@ { HKEY hKey; LCID lcid; - TCHAR Locale[8]; + TCHAR Locale[12]; DWORD dwDisp; + LONG ret = ERROR_SUCCESS; lcid = GetSystemDefaultLCID(); - if (GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_ILANGUAGE, (WORD*)Locale, sizeof(Locale)) == 0) + if (GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_ILANGUAGE, (WORD*)Locale, sizeof(Locale)) != 0) { - return; + if (RegOpenKey(HKEY_CURRENT_USER, L"Control Panel\\International", &hKey) != ERROR_SUCCESS) + { + ret = RegCreateKeyEx(HKEY_LOCAL_MACHINE, L"Control Panel\\International", + 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_WRITE, NULL, &hKey, &dwDisp); + } + + if (ret == ERROR_SUCCESS) + { + RegSetValueEx(hKey, L"Locale", 0, REG_SZ, (LPBYTE)Locale, (DWORD)(lstrlen(Locale)+1)); + } } - - if (RegOpenKey(HKEY_CURRENT_USER, L"Control Panel\\International", &hKey) != ERROR_SUCCESS) - { - if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, L"Control Panel\\International", - 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_WRITE, NULL, &hKey, &dwDisp)) - { - return; - } - } - - RegSetValueExW(hKey, L"Locale", 0, REG_SZ, (LPBYTE) Locale, (DWORD)(sizeof(Locale) / sizeof(TCHAR))); RegCloseKey(hKey); }

1 0

[fireball] 31651: - Don't include ntsecpkg.h for now. If it's needed, it should be included differently.
by fireball＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: fireball Date: Mon Jan 7 22:51:02 2008 New Revision: 31651 URL: http://svn.reactos.org/svn/reactos?rev=31651&view=rev Log: - Don't include ntsecpkg.h for now. If it's needed, it should be included differently. Modified: trunk/reactos/include/psdk/security.h Modified: trunk/reactos/include/psdk/security.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/security.h?re… ============================================================================== --- trunk/reactos/include/psdk/security.h (original) +++ trunk/reactos/include/psdk/security.h Mon Jan 7 22:51:02 2008 @@ -5,7 +5,9 @@ #endif #include <sspi.h> -#include <ntsecpkg.h> + +#if defined(SECURITY_WIN32) || defined(SECURITY_KERNEL) #include <secext.h> +#endif #endif /* _SECURITY_H */

1 0

[dchapyshev] 31650: - Fix typos - Update Russian translation
by dchapyshev＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: dchapyshev Date: Mon Jan 7 20:46:56 2008 New Revision: 31650 URL: http://svn.reactos.org/svn/reactos?rev=31650&view=rev Log: - Fix typos - Update Russian translation Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/eo-EO.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KO.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/wa-WA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc Mon Jan 7 20:46:56 2008 @@ -360,7 +360,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc Mon Jan 7 20:46:56 2008 @@ -361,7 +361,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc Mon Jan 7 20:46:56 2008 @@ -362,7 +362,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc Mon Jan 7 20:46:56 2008 @@ -361,7 +361,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc Mon Jan 7 20:46:56 2008 @@ -363,7 +363,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc Mon Jan 7 20:46:56 2008 @@ -361,7 +361,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc Mon Jan 7 20:46:56 2008 @@ -361,7 +361,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc Mon Jan 7 20:46:56 2008 @@ -361,7 +361,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/eo-EO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/eo-EO.rc Mon Jan 7 20:46:56 2008 @@ -361,7 +361,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc Mon Jan 7 20:46:56 2008 @@ -361,7 +361,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Mon Jan 7 20:46:56 2008 @@ -365,7 +365,7 @@ GROUPBOX "Tâches", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Montrer les tâches communes dans les dossiers", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Utilisez les dossiers Windows class&iques", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Utilisez les dossiers ReactOS class&iques", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Parcourir les dossiers", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Ouvrir tous les dossiers dans la &même fenêtre", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc Mon Jan 7 20:46:56 2008 @@ -364,7 +364,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc Mon Jan 7 20:46:56 2008 @@ -362,7 +362,7 @@ GROUPBOX "Attività", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Mostrare le attività comuni nelle cartelle", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Utilizzare le cartelle nella forma 'Windows class&ic' ", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Utilizzare le cartelle nella forma 'ReactOS class&ic' ", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Sfoglia cartelle", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Aprire ogni cartella nella stessa finestra", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc Mon Jan 7 20:46:56 2008 @@ -361,7 +361,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KO.rc Mon Jan 7 20:46:56 2008 @@ -361,7 +361,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nb-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nb-NO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nb-NO.rc Mon Jan 7 20:46:56 2008 @@ -361,7 +361,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc Mon Jan 7 20:46:56 2008 @@ -361,7 +361,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Mon Jan 7 20:46:56 2008 @@ -362,7 +362,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc Mon Jan 7 20:46:56 2008 @@ -363,7 +363,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc Mon Jan 7 20:46:56 2008 @@ -363,7 +363,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Mon Jan 7 20:46:56 2008 @@ -354,193 +354,192 @@ FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - -GROUPBOX "Tasks", -1, 7, 10, 249, 45 +CAPTION "Îáùèå" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +GROUPBOX "Çàäà÷è", -1, 7, 10, 249, 45 //ICON -AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP -GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP +AUTORADIOBUTTON "Îòîáðà&æåíèå ñïèñêà òèïè÷íûõ çàäà÷ â ïàïêàõ", 14001, 40, 25, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Èñïîëüçîâàòü îáû&÷íûå ïàïêè ReactOS", 14002, 40, 37, 120, 10, WS_TABSTOP +GROUPBOX "Îáçîð ïàïîê", -1, 7, 60, 249, 45, WS_TABSTOP //ICON -AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP -AUTORADIOBUTTON "Open each folder in its own &window", 14005, 40, 82, 140, 10, WS_TABSTOP -GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 +AUTORADIOBUTTON "&Îòêðûâàòü ïàïêè â îäíîì è òîì æå îêíå", 14004, 40, 70, 140, 10, WS_TABSTOP +AUTORADIOBUTTON "Î&òêðûâàòü êàæäóþ ïàïêó â îòäåëüíîì îêíå", 14005, 40, 82, 140, 10, WS_TABSTOP +GROUPBOX "Ùåë÷êè ìûøüþ", -1, 7, 110, 249, 60 //ICON -AUTORADIOBUTTON "&Single-click to open an item (point to select)", 14007, 40, 120, 170, 10, WS_TABSTOP -AUTORADIOBUTTON "Underline icon titles consistent with my &browser", 14008, 50, 132, 170, 10, WS_TABSTOP -AUTORADIOBUTTON "Underline icon titles only when I &point at them", 14009, 50, 144, 170, 10, WS_TABSTOP -AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", 14010, 40, 156, 170, 10, WS_TABSTOP -PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP +AUTORADIOBUTTON "Îò&êðûâàòü îäíèì ùåë÷êîì, âûäåëÿòü óêàçàòåëåì", 14007, 40, 120, 170, 10, WS_TABSTOP +AUTORADIOBUTTON "Ïîä÷åðêèâ&àòü ïîäïèñè çíà÷êîâ", 14008, 50, 132, 170, 10, WS_TABSTOP +AUTORADIOBUTTON "Ïîä÷åðêèâàòü ïîäïèñè ç&íà÷êîâ ïðè íàâåäåíèè", 14009, 50, 144, 170, 10, WS_TABSTOP +AUTORADIOBUTTON "Îòêð&ûâàòü äâîéíûì, à âûäåëÿòü îäíèì ùåë÷êîì", 14010, 40, 156, 170, 10, WS_TABSTOP +PUSHBUTTON "&Âîññòàíîâèòü óìîë÷àíèÿ", 14011, 180, 180, 60, 14, WS_TABSTOP END FOLDER_OPTIONS_VIEW_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "View" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN -GROUPBOX "Folder views", -1, 7, 10, 249, 60 +CAPTION "Âèä" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +GROUPBOX "Ïðåäñòàâëåíèå ïàïîê", -1, 7, 10, 249, 60 //ICON -LTEXT "You can apply the view(such as Details or Tiles) that\nyou are using for this folder to all folders.", -1, 60, 20, 180, 20 -PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP -PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP -LTEXT "Advanced settings:", -1, 7, 80, 100, 10 +LTEXT "Ìîæíî ïðèìåíèòü âèä, âûáðàííûé äëÿ ýòîé ïàïêè, íàïðèìåð, ""Òàáëèöà"" èëè ""Ïëèòêà"", êî âñåì ïàïêàì.", -1, 60, 20, 180, 20 +PUSHBUTTON "&Ïðèìåíèòü êî âñåì ïàïêàì", 14001, 60, 50, 80, 14, WS_TABSTOP +PUSHBUTTON "&Ñáðîñ äëÿ âñåõ ïàïîê", 14002, 150, 50, 80, 14, WS_TABSTOP +LTEXT "Äîïîëíèòåëüíûå ïàðàìåòðû:", -1, 7, 80, 100, 10 CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120 -PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP +PUSHBUTTON "&Âîññòàíîâèòü óìîë÷àíèÿ", 14004, 180, 210, 80, 14, WS_TABSTOP END FOLDER_OPTIONS_FILETYPES_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "File Types" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN -LTEXT "Registered file &types:", -1, 7, 10, 70, 10 +CAPTION "Òèïû ôàéëîâ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "&Çàðåãèñòðèðîâàííûå òèïû ôàéëîâ:", -1, 7, 10, 70, 10 CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 -PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP -PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP -GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 -LTEXT "Opens with:", -1, 12, 140, 40, 10 +PUSHBUTTON "&Ñîçäàòü", 14001, 120, 110, 50, 14, WS_TABSTOP +PUSHBUTTON "&Óäàëèòü", 14002, 180, 110, 50, 14, WS_TABSTOP +GROUPBOX "Îïèñàíèå ðàñøèðåíèÿ '%s'", 14003, 7, 130, 249, 70 +LTEXT "Îòêðûâàòü â:", -1, 12, 140, 40, 10 //ICON -LTEXT "Appname", 14005, 100, 140, 40, 10 -PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 -PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP +LTEXT "Ïðèëîæåíèå:", 14005, 100, 140, 40, 10 +PUSHBUTTON "&Èçìåíèòü...", 14006, 180, 140, 50, 14, WS_TABSTOP +LTEXT "Ôàéëû ñ ðàñøèðåíèåì '%s' èìåþò òèï '%s'. Äëÿ\nèçìåíåíèÿ ïàðàìåòðîâ âñåõ ôàéëîâ '%s', íàæìèòå\n""Äîïîëíèòåëüíî"".", 14007, 12, 155, 160, 30 +PUSHBUTTON "Äî&ïîëíèòåëüíî", 14008, 180, 175, 50, 14, WS_TABSTOP END CONFIRM_FILE_REPLACE_DLG DIALOGEX 0, 0, 282, 143 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Confirm File Replace" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Yes", IDYES, 20, 122, 60, 14 - PUSHBUTTON "Yes to &All", 12807, 85, 122, 60, 14 - PUSHBUTTON "&No", IDNO, 150, 122, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 215, 122, 60, 14 +CAPTION "Ïîäòâåðæäåíèå çàìåíû ôàéëà" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Äà", IDYES, 20, 122, 60, 14 + PUSHBUTTON "Äà - äëÿ &âñåõ", 12807, 85, 122, 60, 14 + PUSHBUTTON "&Íåò", IDNO, 150, 122, 60, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 215, 122, 60, 14 ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "This folder already contains a file named '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX - LTEXT "This folder already contains a read-only file named '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX - LTEXT "This folder already contains a system file named '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX - LTEXT "Would you like to replace the existing file", -1, 44, 35, 228, 10, SS_NOPREFIX - LTEXT "(unknown date and size)", 12302, 79, 51, 198, 20, SS_NOPREFIX + LTEXT "Ïàïêà óæå ñîäåðæèò ôàéë ""%2"".", 12291, 44, 10, 231, 22, SS_NOPREFIX + LTEXT "Ïàïêà óæå ñîäåðæèò äîñòóïíûé òîëüêî äëÿ ÷òåíèÿ ôàéë ""%2"".", 12292, 41, 10, 222, 22, SS_NOPREFIX + LTEXT "Ïàïêà óæå ñîäåðæèò ñèñòåìíûé ôàéë ""%2"".", 12293, 41, 10, 222, 22, SS_NOPREFIX + LTEXT "Çàìåíèòü èìåþùèéñÿ ôàéë", -1, 44, 35, 228, 10, SS_NOPREFIX + LTEXT "(äàòà è ðàçìåð íåèçâåñòíû)", 12302, 79, 51, 198, 20, SS_NOPREFIX ICON "", 12300, 50, 49, 21, 20, SS_REALSIZECONTROL - LTEXT "with this one?", -1, 44, 75, 228, 10, SS_NOPREFIX - LTEXT "(unknown date and size)", 12303, 79, 91, 198, 20, SS_NOPREFIX + LTEXT "ñëåäóþùèì ôàéëîì?", -1, 44, 75, 228, 10, SS_NOPREFIX + LTEXT "(äàòà è ðàçìåð íåèçâåñòíû)", 12303, 79, 91, 198, 20, SS_NOPREFIX ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END LOGOFF_DLG DIALOGEX 0, 0, 190, 60 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Log Off ReactOS" +CAPTION "Âûõîä èç ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + LTEXT "Âû äåéñòâèòåëüíî õîòèòå âûéòè èç ñèñòåìû?", -1, 43, 11, 140, 22 + DEFPUSHBUTTON "Â&ûõîä", IDOK, 57, 40, 60, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 122, 40, 60, 14 END DISCONNECT_DLG DIALOGEX 0, 0, 190, 60 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Disconnect ReactOS" +CAPTION "Îòêëþ÷åíèå ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON 49, 14346, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to disconnect?", -1, 49, 12, 137, 23 - DEFPUSHBUTTON "&Disconnect", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 123, 40, 60, 14 + LTEXT "Âû äåéñòâèòåëüíî õîòèòå âûïîëíèòü îòêëþ÷åíèå?", -1, 49, 12, 137, 23 + DEFPUSHBUTTON "Îòêëþ&÷åíèå", IDOK, 57, 40, 60, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 123, 40, 60, 14 END AUTOPLAY1_DLG DIALOGEX 0, 0, 227, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "AutoPlay" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Select a content type, then choose an action for ReactOS to perform automatically when that type is used in this device:", 1000, 7, 7, 215, 20 +CAPTION "Àâòîçàïóñê" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Âûáåðèòå &òèï ñîäåðæèìîãî, à çàòåì äåéñòâèå, àâòîìàòè÷åñêè âûïîëíÿåìîå ïðè åãî îáíàðóæåíèè â ýòîì óñòðîéñòâå:", 1000, 7, 7, 215, 20 CONTROL "", 1001, "COMBOBOXEX32", WS_TABSTOP | 0x00000043, 7, 27, 212, 200 - GROUPBOX "Actions", -1, 7, 45, 212, 146 - AUTORADIOBUTTON "Select an action to &perform:", 1005, 14, 54, 202, 10, WS_GROUP + GROUPBOX "Äåéñòâèÿ", -1, 7, 45, 212, 146 + AUTORADIOBUTTON "&Âûáåðèòå âûïîëíÿåìîå äåéñòâèå:", 1005, 14, 54, 202, 10, WS_GROUP CONTROL "LIST2", 1002, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 22, 66, 192, 107 - AUTORADIOBUTTON "Prompt me each time to &choose an action", 1006, 14, 177, 202, 10 - PUSHBUTTON "&Restore Defaults", 1008, 108, 197, 110, 14, WS_DISABLED + AUTORADIOBUTTON "Âûäàâàòü &çàïðîñ íà âûáîð âûïîëíÿåìîãî äåéñòâèÿ", 1006, 14, 177, 202, 10 + PUSHBUTTON "Âîññòàíîâèòü óìîë&÷àíèÿ", 1008, 108, 197, 110, 14, WS_DISABLED END MIXED_CONTENT1_DLG DIALOG 0, 0, 227, 207 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "Mixed Content" +CAPTION "Ñìåøàííîå ñîäåðæèìîå" FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "This disk or device contains more than one type of content.", 1001, 32, 7, 191, 20 - LTEXT "What do you want ReactOS to do?", 1002, 32, 31, 188, 8 + LTEXT "Íà ýòîì äèñêå èëè óñòðîéñòâå õðàíèòñÿ ñîäåðæèìîå ðàçëè÷íûõ òèïîâ.", 1001, 32, 7, 191, 20 + LTEXT "Êàêîå äåéñòâèå ñëåäóåò âûïîëíÿòü ReactOS?", 1002, 32, 31, 188, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139 DEFPUSHBUTTON "OK", IDOK, 96, 186, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 186, 60, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 160, 186, 60, 14 END MIXED_CONTENT2_DLG DIALOG 0, 0, 227, 206 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "Mixed Content" +CAPTION "Ñìåøàííîå ñîäåðæèìîå" FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS can perform the same action each time you insert a disk or connect a device with this kind of file:", 1001, 30, 7, 193, 20 + LTEXT "ReactOS ìîæåò âñåãäà âûïîëíÿòü îäíî è òî æå äåéñòâèå, êîãäà âû âñòàâëÿåòå äèñê èëè ïîäêëþ÷àåòå óñòðîéñòâî ñ ôàéëàìè ñëåäóþùåãî òèïà:", 1001, 30, 7, 193, 20 ICON "", 1005, 32, 27, 11, 10, SS_REALSIZECONTROL EDITTEXT 1006, 49, 28, 177, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "What do you want ReactOS to do?", 1002, 32, 41, 190, 8 + LTEXT "Êàêîå äåéñòâèå ñëåäóåò âûïîëíÿòü ReactOS?", 1002, 32, 41, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112 - AUTOCHECKBOX "Always do the selected action.", 1004, 32, 171, 190, 10 + AUTOCHECKBOX "Âñåãäà âûïîëíÿòü âûáðàííîå äåéñòâèå.", 1004, 32, 171, 190, 10 DEFPUSHBUTTON "OK", IDOK, 96, 185, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 185, 60, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 160, 185, 60, 14 END AUTOPLAY2_DLG DIALOG 0, 0, 227, 181 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "Autoplay" +CAPTION "Àâòîçàïóñê" FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS can perform the same action each time you connect this device.", 1001, 32, 7, 190, 22 - LTEXT "&What do you want ReactOS to do?", 1002, 32, 31, 190, 8 + LTEXT "ReactOS ìîæåò âûïîëíÿòü îäíî è òî æå äåéñòâèå ïðè êàæäîì ïîäêëþ÷åíèè ýòîãî óñòðîéñòâà.", 1001, 32, 7, 190, 22 + LTEXT "&Êàêîå äåéñòâèå ñëåäóåò âûïîëíÿòü ReactOS?", 1002, 32, 31, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96 - AUTOCHECKBOX "&Always perform the selected action", 1004, 32, 143, 190, 8 + AUTOCHECKBOX "&Âñåãäà âûïîëíÿòü âûáðàííîå äåéñòâèå", 1004, 32, 143, 190, 8 DEFPUSHBUTTON "OK", IDOK, 94, 160, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 159, 160, 60, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 159, 160, 60, 14 END SHUTDOWN_DLG DIALOG 0, 0, 211, 103 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Shut Down ReactOS" +CAPTION "Çàâåðøåíèå ðàáîòû ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON 8240, -1, 6, 6, 21, 20, SS_REALSIZECONTROL | WS_GROUP - LTEXT "What do you want the computer to do?", -1, 39, 7, 167, 10 + LTEXT "Âûáåðèòå æåëàåìîå äåéñòâèå.", -1, 39, 7, 167, 10 COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL - LTEXT "Maintains your session, keeping the computer running on low power with data still in memory. The computer wakes up when you press a key or move the mouse.", 8225, 39, 40, 167, 37 + LTEXT "Ñîõðàíèòü ñåàíñ, îáåñïå÷èâàÿ ðàáîòó êîìïüþòåðà â ñïÿùåì ðåæèìå è äàííûìè â ïàìÿòè. Ïðè íàæàòèè íà ëþáóþ êëàâèøó èëè ïåðåäâèæåíèè ìûøè êîìïüþòåð âîçâðàòèòñÿ â îáû÷íûé ðåæèì.", 8225, 39, 40, 167, 37 DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 75, 82, 60, 14 - PUSHBUTTON "&Help", IDHELP, 144, 82, 60, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 75, 82, 60, 14 + PUSHBUTTON "&Ñïðàâêà", IDHELP, 144, 82, 60, 14 END FORMAT_DLG DIALOGEX 50, 50, 184, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Format" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Start", IDOK, 53, 198, 60, 14 - PUSHBUTTON "&Close", IDCANCEL, 118, 198, 60, 14 - LTEXT "Ca&pacity:", -1, 7, 6, 169, 9 +CAPTION "Ôîðìàòèðîâàíèå" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Íà÷àòü", IDOK, 53, 198, 60, 14 + PUSHBUTTON "&Çàêðûòü", IDCANCEL, 118, 198, 60, 14 + LTEXT "&Åìêîñòü:", -1, 7, 6, 169, 9 COMBOBOX 28673, 7, 17, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "&File system", -1, 7, 35, 170, 9 + LTEXT "&Ôàéëîâàÿ ñèñòåìà:", -1, 7, 35, 170, 9 COMBOBOX 28677, 7, 46, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP CONTROL "", 28678, "MSCTLS_PROGRESS32", 0, 7, 181, 170, 8 - LTEXT "&Allocation unit size", -1, 7, 64, 170, 9 + LTEXT "&Ðàçìåð êëàñòåðà:", -1, 7, 64, 170, 9 COMBOBOX 28680, 7, 75, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Volume &label", -1, 7, 93, 170, 9 + LTEXT "&Ìåòêà òîìà:", -1, 7, 93, 170, 9 EDITTEXT 28679, 7, 103, 170, 13, ES_AUTOHSCROLL - GROUPBOX "Format &options", 4610, 7, 121, 170, 49 - AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 - AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 + GROUPBOX "&Ñïîñîáû ôîðìàòèðîâàíèÿ:", 4610, 7, 121, 170, 49 + AUTOCHECKBOX "&Áûñòðîå (î÷èñòêà îãëàâëåíèÿ)", 28674, 16, 135, 155, 10 + AUTOCHECKBOX "&Èñïîëüçîâàòü ñæàòèå", 28675, 16, 152, 155, 10 END STRINGTABLE DISCARDABLE @@ -640,5 +639,5 @@ FCIDM_SHVIEW_NEW "Ñîçäàòü" FCIDM_SHVIEW_NEWFOLDER "&Ïàïêà" FCIDM_SHVIEW_NEWLINK "&ßðëûê" - IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_FOLDER_OPTIONS "Ñâîéñòâà ïàïêè" +END Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc Mon Jan 7 20:46:56 2008 @@ -367,7 +367,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc Mon Jan 7 20:46:56 2008 @@ -361,7 +361,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc Mon Jan 7 20:46:56 2008 @@ -361,7 +361,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc Mon Jan 7 20:46:56 2008 @@ -361,7 +361,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/wa-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/wa-WA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/wa-WA.rc Mon Jan 7 20:46:56 2008 @@ -361,7 +361,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc Mon Jan 7 20:46:56 2008 @@ -362,7 +362,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Mon Jan 7 20:46:56 2008 @@ -362,7 +362,7 @@ GROUPBOX "Tasks", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP

1 0

[dchapyshev] 31649: - Add locale information to registry - Change main.cpl to input.dll
by dchapyshev＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: dchapyshev Date: Mon Jan 7 20:36:02 2008 New Revision: 31649 URL: http://svn.reactos.org/svn/reactos?rev=31649&view=rev Log: - Add locale information to registry - Change main.cpl to input.dll Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Mon Jan 7 20:36:02 2008 @@ -801,7 +801,7 @@ &StartupInfo, &ProcessInformation)) { - MessageBox(hwnd, _T("Error: failed to launch rundll32"), _T("Error"), MB_ICONERROR); + MessageBox(hwnd, _T("Error: failed to launch rundll32"), NULL, MB_ICONERROR); return FALSE; } @@ -809,6 +809,36 @@ CloseHandle(ProcessInformation.hThread); CloseHandle(ProcessInformation.hProcess); return TRUE; +} + +static VOID +WriteUserLocale(VOID) +{ + HKEY hKey; + LCID lcid; + TCHAR Locale[8]; + DWORD dwDisp; + + lcid = GetSystemDefaultLCID(); + + if (GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_ILANGUAGE, (WORD*)Locale, sizeof(Locale)) == 0) + { + return; + } + + if (RegOpenKey(HKEY_CURRENT_USER, L"Control Panel\\International", &hKey) != ERROR_SUCCESS) + { + if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, L"Control Panel\\International", + 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_WRITE, NULL, &hKey, &dwDisp)) + { + return; + } + } + + RegSetValueExW(hKey, L"Locale", 0, REG_SZ, (LPBYTE) Locale, (DWORD)(sizeof(Locale) / sizeof(TCHAR))); + + RegCloseKey(hKey); } static INT_PTR CALLBACK @@ -830,10 +860,9 @@ /* Save pointer to the global setup data */ SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)SetupData); - + WriteUserLocale(); SetKeyboardLayoutName(GetDlgItem(hwndDlg, IDC_LAYOUTTEXT)); - } break; @@ -852,7 +881,7 @@ case IDC_CUSTOMLAYOUT: { - wcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL main.cpl,@1")); + wcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL input.dll,@1")); RunControlPanelApplet(hwndDlg, szBuffer); } break; @@ -1933,8 +1962,10 @@ break; case WM_DESTROY: - SetupIsActive(0); - return TRUE; + { + SetupIsActive(0); + return TRUE; + } case WM_TIMER: {

1 0

[cfinck] 31648: Fix the indentation mess in "settings.c" as well
by cfinck＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: cfinck Date: Mon Jan 7 20:22:05 2008 New Revision: 31648 URL: http://svn.reactos.org/svn/reactos?rev=31648&view=rev Log: Fix the indentation mess in "settings.c" as well Modified: trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c (original) +++ trunk/reactos/base/setup/usetup/settings.c Mon Jan 7 20:22:05 2008 @@ -36,818 +36,828 @@ GetComputerIdentifier(PWSTR Identifier, ULONG IdentifierLength) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - LPCWSTR ComputerIdentifier; - HANDLE ProcessorsKey; - PKEY_FULL_INFORMATION pFullInfo; - ULONG Size, SizeNeeded; - NTSTATUS Status; - - DPRINT("GetComputerIdentifier() called\n"); - - Size = sizeof(KEY_FULL_INFORMATION); - pFullInfo = (PKEY_FULL_INFORMATION)RtlAllocateHeap(RtlGetProcessHeap(), 0, Size); - if (!pFullInfo) - { - DPRINT("RtlAllocateHeap() failed\n"); - return FALSE; - } - - /* Open the processors key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\CentralProcessor"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenKey(&ProcessorsKey, - KEY_QUERY_VALUE , - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status 0x%lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); - return FALSE; - } - - /* Get number of subkeys */ - Status = NtQueryKey( - ProcessorsKey, - KeyFullInformation, - pFullInfo, - Size, - &Size); - NtClose(ProcessorsKey); - if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) - { - DPRINT("NtQueryKey() failed (Status 0x%lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); - return FALSE; - } - - /* Find computer identifier */ - if (pFullInfo->SubKeys == 0) - { - /* Something strange happened. No processor detected */ - RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); - return FALSE; - } - - if (pFullInfo->SubKeys == 1) - { - /* Computer is mono-CPU */ - ComputerIdentifier = L"PC UP"; - } - else - { - /* Computer is multi-CPUs */ - ComputerIdentifier = L"PC MP"; - } - RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); - - /* Copy computer identifier to return buffer */ - SizeNeeded = (wcslen(ComputerIdentifier) + 1) * sizeof(WCHAR); - if (SizeNeeded > IdentifierLength) - return FALSE; - RtlCopyMemory(Identifier, ComputerIdentifier, SizeNeeded); - return TRUE; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + LPCWSTR ComputerIdentifier; + HANDLE ProcessorsKey; + PKEY_FULL_INFORMATION pFullInfo; + ULONG Size, SizeNeeded; + NTSTATUS Status; + + DPRINT("GetComputerIdentifier() called\n"); + + Size = sizeof(KEY_FULL_INFORMATION); + pFullInfo = (PKEY_FULL_INFORMATION)RtlAllocateHeap(RtlGetProcessHeap(), 0, Size); + if (!pFullInfo) + { + DPRINT("RtlAllocateHeap() failed\n"); + return FALSE; + } + + /* Open the processors key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\CentralProcessor"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenKey(&ProcessorsKey, + KEY_QUERY_VALUE , + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtOpenKey() failed (Status 0x%lx)\n", Status); + RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); + return FALSE; + } + + /* Get number of subkeys */ + Status = NtQueryKey( + ProcessorsKey, + KeyFullInformation, + pFullInfo, + Size, + &Size); + NtClose(ProcessorsKey); + + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + DPRINT("NtQueryKey() failed (Status 0x%lx)\n", Status); + RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); + return FALSE; + } + + /* Find computer identifier */ + if (pFullInfo->SubKeys == 0) + { + /* Something strange happened. No processor detected */ + RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); + return FALSE; + } + + if (pFullInfo->SubKeys == 1) + { + /* Computer is mono-CPU */ + ComputerIdentifier = L"PC UP"; + } + else + { + /* Computer is multi-CPUs */ + ComputerIdentifier = L"PC MP"; + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); + + /* Copy computer identifier to return buffer */ + SizeNeeded = (wcslen(ComputerIdentifier) + 1) * sizeof(WCHAR); + if (SizeNeeded > IdentifierLength) + return FALSE; + + RtlCopyMemory(Identifier, ComputerIdentifier, SizeNeeded); + + return TRUE; } PGENERIC_LIST CreateComputerTypeList(HINF InfFile) { - CHAR Buffer[128]; - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - PWCHAR UserData; - WCHAR ComputerIdentifier[128]; - WCHAR ComputerKey[32]; - - /* Get the computer identification */ - if (!GetComputerIdentifier(ComputerIdentifier, 128)) - { - ComputerIdentifier[0] = 0; - } - - DPRINT("Computer identifier: '%S'\n", ComputerIdentifier); - - /* Search for matching device identifier */ - if (!SetupFindFirstLineW(InfFile, L"Map.Computer", NULL, &Context)) - { - /* FIXME: error message */ - return NULL; - } - - do - { - if (!INF_GetDataField(&Context, 1, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } - - DPRINT("KeyValue: %S\n", KeyValue); - if (wcsstr(ComputerIdentifier, KeyValue)) - { - if (!INF_GetDataField(&Context, 0, &KeyName)) + CHAR Buffer[128]; + PGENERIC_LIST List; + INFCONTEXT Context; + PWCHAR KeyName; + PWCHAR KeyValue; + PWCHAR UserData; + WCHAR ComputerIdentifier[128]; + WCHAR ComputerKey[32]; + + /* Get the computer identification */ + if (!GetComputerIdentifier(ComputerIdentifier, 128)) + { + ComputerIdentifier[0] = 0; + } + + DPRINT("Computer identifier: '%S'\n", ComputerIdentifier); + + /* Search for matching device identifier */ + if (!SetupFindFirstLineW(InfFile, L"Map.Computer", NULL, &Context)) + { + /* FIXME: error message */ + return NULL; + } + + do + { + if (!INF_GetDataField(&Context, 1, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetDataField() failed\n"); + return NULL; + } + + DPRINT("KeyValue: %S\n", KeyValue); + if (wcsstr(ComputerIdentifier, KeyValue)) + { + if (!INF_GetDataField(&Context, 0, &KeyName)) { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; + /* FIXME: Handle error! */ + DPRINT("INF_GetDataField() failed\n"); + return NULL; } - DPRINT("Computer key: %S\n", KeyName); - wcscpy(ComputerKey, KeyName); - } - } - while (SetupFindNextLine(&Context, &Context)); - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (!SetupFindFirstLineW (InfFile, L"Computer", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, Buffer, UserData, - _wcsicmp(KeyName, ComputerKey) ? FALSE : TRUE); - } - while (SetupFindNextLine(&Context, &Context)); - - return List; + DPRINT("Computer key: %S\n", KeyName); + wcscpy(ComputerKey, KeyName); + } + } while (SetupFindNextLine(&Context, &Context)); + + List = CreateGenericList(); + if (List == NULL) + return NULL; + + if (!SetupFindFirstLineW (InfFile, L"Computer", NULL, &Context)) + { + DestroyGenericList(List, FALSE); + return NULL; + } + + do + { + if (!INF_GetData (&Context, &KeyName, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetData() failed\n"); + break; + } + + UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, + 0, + (wcslen(KeyName) + 1) * sizeof(WCHAR)); + if (UserData == NULL) + { + /* FIXME: Handle error! */ + } + + wcscpy(UserData, KeyName); + + sprintf(Buffer, "%S", KeyValue); + AppendGenericListEntry(List, Buffer, UserData, + _wcsicmp(KeyName, ComputerKey) ? FALSE : TRUE); + } while (SetupFindNextLine(&Context, &Context)); + + return List; } static BOOLEAN GetDisplayIdentifier(PWSTR Identifier, - ULONG IdentifierLength) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - WCHAR Buffer[32]; - HANDLE BusKey; - HANDLE BusInstanceKey; - HANDLE ControllerKey; - HANDLE ControllerInstanceKey; - ULONG BusInstance; - ULONG ControllerInstance; - ULONG BufferLength; - ULONG ReturnedLength; - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - NTSTATUS Status; - - DPRINT("GetDisplayIdentifier() called\n"); - - /* Open the bus key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\HARDWARE\\Description\\System\\MultifunctionAdapter"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenKey(&BusKey, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - BusInstance = 0; - while (TRUE) - { - swprintf(Buffer, L"%lu", BusInstance); - RtlInitUnicodeString(&KeyName, - Buffer); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - BusKey, - NULL); - Status = NtOpenKey(&BusInstanceKey, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); - NtClose(BusKey); - return FALSE; - } - - /* Open the controller type key */ - RtlInitUnicodeString(&KeyName, - L"DisplayController"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - BusInstanceKey, - NULL); - Status = NtOpenKey(&ControllerKey, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - ControllerInstance = 0; - while (TRUE) - { - /* Open the pointer controller instance key */ - swprintf(Buffer, L"%lu", ControllerInstance); - RtlInitUnicodeString(&KeyName, - Buffer); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ControllerKey, - NULL); - Status = NtOpenKey(&ControllerInstanceKey, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); - NtClose(ControllerKey); - NtClose(BusInstanceKey); - NtClose(BusKey); - return FALSE; - } - - /* Get controller identifier */ - RtlInitUnicodeString(&KeyName, - L"Identifier"); - - BufferLength = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + - 256 * sizeof(WCHAR); - ValueInfo = (KEY_VALUE_PARTIAL_INFORMATION*) RtlAllocateHeap(RtlGetProcessHeap(), - 0, - BufferLength); - if (ValueInfo == NULL) - { - DPRINT("RtlAllocateHeap() failed\n"); - NtClose(ControllerInstanceKey); - NtClose(ControllerKey); - NtClose(BusInstanceKey); - NtClose(BusKey); - return FALSE; - } - - Status = NtQueryValueKey(ControllerInstanceKey, - &KeyName, - KeyValuePartialInformation, - ValueInfo, - BufferLength, - &ReturnedLength); - if (NT_SUCCESS(Status)) - { - DPRINT("Identifier: %S\n", (PWSTR)ValueInfo->Data); - - BufferLength = min(ValueInfo->DataLength / sizeof(WCHAR), IdentifierLength); - RtlCopyMemory (Identifier, - ValueInfo->Data, - BufferLength * sizeof(WCHAR)); - Identifier[BufferLength] = 0; - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - ValueInfo); - NtClose(ControllerInstanceKey); - NtClose(ControllerKey); - NtClose(BusInstanceKey); - NtClose(BusKey); - return TRUE; - } - - NtClose(ControllerInstanceKey); - - ControllerInstance++; - } - - NtClose(ControllerKey); - } - - NtClose(BusInstanceKey); - - BusInstance++; - } - - NtClose(BusKey); - - return FALSE; + ULONG IdentifierLength) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + WCHAR Buffer[32]; + HANDLE BusKey; + HANDLE BusInstanceKey; + HANDLE ControllerKey; + HANDLE ControllerInstanceKey; + ULONG BusInstance; + ULONG ControllerInstance; + ULONG BufferLength; + ULONG ReturnedLength; + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; + NTSTATUS Status; + + DPRINT("GetDisplayIdentifier() called\n"); + + /* Open the bus key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\HARDWARE\\Description\\System\\MultifunctionAdapter"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenKey(&BusKey, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtOpenKey() failed (Status %lx)\n", Status); + return FALSE; + } + + BusInstance = 0; + while (TRUE) + { + swprintf(Buffer, L"%lu", BusInstance); + RtlInitUnicodeString(&KeyName, + Buffer); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + BusKey, + NULL); + + Status = NtOpenKey(&BusInstanceKey, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtOpenKey() failed (Status %lx)\n", Status); + NtClose(BusKey); + return FALSE; + } + + /* Open the controller type key */ + RtlInitUnicodeString(&KeyName, + L"DisplayController"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + BusInstanceKey, + NULL); + + Status = NtOpenKey(&ControllerKey, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + ControllerInstance = 0; + + while (TRUE) + { + /* Open the pointer controller instance key */ + swprintf(Buffer, L"%lu", ControllerInstance); + RtlInitUnicodeString(&KeyName, + Buffer); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ControllerKey, + NULL); + + Status = NtOpenKey(&ControllerInstanceKey, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtOpenKey() failed (Status %lx)\n", Status); + NtClose(ControllerKey); + NtClose(BusInstanceKey); + NtClose(BusKey); + return FALSE; + } + + /* Get controller identifier */ + RtlInitUnicodeString(&KeyName, + L"Identifier"); + + BufferLength = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + + 256 * sizeof(WCHAR); + ValueInfo = (KEY_VALUE_PARTIAL_INFORMATION*) RtlAllocateHeap(RtlGetProcessHeap(), + 0, + BufferLength); + if (ValueInfo == NULL) + { + DPRINT("RtlAllocateHeap() failed\n"); + NtClose(ControllerInstanceKey); + NtClose(ControllerKey); + NtClose(BusInstanceKey); + NtClose(BusKey); + return FALSE; + } + + Status = NtQueryValueKey(ControllerInstanceKey, + &KeyName, + KeyValuePartialInformation, + ValueInfo, + BufferLength, + &ReturnedLength); + if (NT_SUCCESS(Status)) + { + DPRINT("Identifier: %S\n", (PWSTR)ValueInfo->Data); + + BufferLength = min(ValueInfo->DataLength / sizeof(WCHAR), IdentifierLength); + RtlCopyMemory (Identifier, + ValueInfo->Data, + BufferLength * sizeof(WCHAR)); + Identifier[BufferLength] = 0; + + RtlFreeHeap(RtlGetProcessHeap(), + 0, + ValueInfo); + + NtClose(ControllerInstanceKey); + NtClose(ControllerKey); + NtClose(BusInstanceKey); + NtClose(BusKey); + return TRUE; + } + + NtClose(ControllerInstanceKey); + + ControllerInstance++; + } + + NtClose(ControllerKey); + } + + NtClose(BusInstanceKey); + + BusInstance++; + } + + NtClose(BusKey); + + return FALSE; } PGENERIC_LIST CreateDisplayDriverList(HINF InfFile) { - CHAR Buffer[128]; - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - PWCHAR UserData; - WCHAR DisplayIdentifier[128]; - WCHAR DisplayKey[32]; - - /* Get the display identification */ - if (!GetDisplayIdentifier(DisplayIdentifier, 128)) - { - DisplayIdentifier[0] = 0; - } - - DPRINT("Display identifier: '%S'\n", DisplayIdentifier); - - /* Search for matching device identifier */ - if (!SetupFindFirstLineW(InfFile, L"Map.Display", NULL, &Context)) - { - /* FIXME: error message */ - return NULL; - } - - do - { - if (!INF_GetDataField(&Context, 1, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } - - DPRINT("KeyValue: %S\n", KeyValue); - if (wcsstr(DisplayIdentifier, KeyValue)) - { - if (!INF_GetDataField(&Context, 0, &KeyName)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } - - DPRINT("Display key: %S\n", KeyName); - wcscpy(DisplayKey, KeyName); - } - } - while (SetupFindNextLine(&Context, &Context)); - - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (!SetupFindFirstLineW (InfFile, L"Display", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!INF_GetDataField(&Context, 0, &KeyName)) - { - DPRINT1("INF_GetDataField() failed\n"); - break; - } - - if (!INF_GetDataField(&Context, 1, &KeyValue)) - { - DPRINT1("INF_GetDataField() failed\n"); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - DPRINT1("RtlAllocateHeap() failed\n"); - DestroyGenericList(List, TRUE); - return NULL; - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, - Buffer, - UserData, - _wcsicmp(KeyName, DisplayKey) ? FALSE : TRUE); - } - while (SetupFindNextLine(&Context, &Context)); + CHAR Buffer[128]; + PGENERIC_LIST List; + INFCONTEXT Context; + PWCHAR KeyName; + PWCHAR KeyValue; + PWCHAR UserData; + WCHAR DisplayIdentifier[128]; + WCHAR DisplayKey[32]; + + /* Get the display identification */ + if (!GetDisplayIdentifier(DisplayIdentifier, 128)) + { + DisplayIdentifier[0] = 0; + } + + DPRINT("Display identifier: '%S'\n", DisplayIdentifier); + + /* Search for matching device identifier */ + if (!SetupFindFirstLineW(InfFile, L"Map.Display", NULL, &Context)) + { + /* FIXME: error message */ + return NULL; + } + + do + { + if (!INF_GetDataField(&Context, 1, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetDataField() failed\n"); + return NULL; + } + + DPRINT("KeyValue: %S\n", KeyValue); + if (wcsstr(DisplayIdentifier, KeyValue)) + { + if (!INF_GetDataField(&Context, 0, &KeyName)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetDataField() failed\n"); + return NULL; + } + + DPRINT("Display key: %S\n", KeyName); + wcscpy(DisplayKey, KeyName); + } + } while (SetupFindNextLine(&Context, &Context)); + + List = CreateGenericList(); + if (List == NULL) + return NULL; + + if (!SetupFindFirstLineW (InfFile, L"Display", NULL, &Context)) + { + DestroyGenericList(List, FALSE); + return NULL; + } + + do + { + if (!INF_GetDataField(&Context, 0, &KeyName)) + { + DPRINT1("INF_GetDataField() failed\n"); + break; + } + + if (!INF_GetDataField(&Context, 1, &KeyValue)) + { + DPRINT1("INF_GetDataField() failed\n"); + break; + } + + UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, + 0, + (wcslen(KeyName) + 1) * sizeof(WCHAR)); + if (UserData == NULL) + { + DPRINT1("RtlAllocateHeap() failed\n"); + DestroyGenericList(List, TRUE); + return NULL; + } + + wcscpy(UserData, KeyName); + + sprintf(Buffer, "%S", KeyValue); + AppendGenericListEntry(List, + Buffer, + UserData, + _wcsicmp(KeyName, DisplayKey) ? FALSE : TRUE); + } while (SetupFindNextLine(&Context, &Context)); #if 0 - AppendGenericListEntry(List, "Other display driver", NULL, TRUE); + AppendGenericListEntry(List, "Other display driver", NULL, TRUE); #endif - return List; + return List; } BOOLEAN ProcessComputerFiles(HINF InfFile, PGENERIC_LIST List, PWCHAR* AdditionalSectionName) { - PGENERIC_LIST_ENTRY Entry; - static WCHAR SectionName[128]; - - DPRINT("ProcessComputerFiles() called\n"); - - Entry = GetGenericListEntry(List); - if (Entry == NULL) - { - DPRINT("GetGenericListEntry() failed\n"); - return FALSE; - } - - wcscpy(SectionName, L"Files."); - wcscat(SectionName, (const wchar_t*) Entry->UserData); - *AdditionalSectionName = SectionName; - - return TRUE; + PGENERIC_LIST_ENTRY Entry; + static WCHAR SectionName[128]; + + DPRINT("ProcessComputerFiles() called\n"); + + Entry = GetGenericListEntry(List); + if (Entry == NULL) + { + DPRINT("GetGenericListEntry() failed\n"); + return FALSE; + } + + wcscpy(SectionName, L"Files."); + wcscat(SectionName, (const wchar_t*) Entry->UserData); + *AdditionalSectionName = SectionName; + + return TRUE; } BOOLEAN ProcessDisplayRegistry(HINF InfFile, PGENERIC_LIST List) { - PGENERIC_LIST_ENTRY Entry; - INFCONTEXT Context; - PWCHAR ServiceName; - ULONG StartValue; - NTSTATUS Status; - WCHAR RegPath [255]; - PWCHAR Buffer; - ULONG Width, Hight, Bpp; - - DPRINT("ProcessDisplayRegistry() called\n"); - - Entry = GetGenericListEntry(List); - if (Entry == NULL) - { - DPRINT("GetGenericListEntry() failed\n"); - return FALSE; - } - - if (!SetupFindFirstLineW(InfFile, L"Display", (WCHAR*) Entry->UserData, &Context)) - { - DPRINT("SetupFindFirstLineW() failed\n"); - return FALSE; - } - - /* Enable the right driver */ - if (!INF_GetDataField(&Context, 3, &ServiceName)) - { - DPRINT("INF_GetDataField() failed\n"); - return FALSE; - } - - ASSERT(wcslen(ServiceName) < 10); - DPRINT("Service name: %S\n", ServiceName); - - StartValue = 1; - Status = RtlWriteRegistryValue(RTL_REGISTRY_SERVICES, - ServiceName, - L"Start", - REG_DWORD, - &StartValue, - sizeof(ULONG)); - - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); - return FALSE; - } - - /* Set the resolution */ - swprintf(RegPath, L"\\Registry\\Machine\\System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\%s\\Device0", ServiceName); - - if (!INF_GetDataField(&Context, 4, &Buffer)) - { - DPRINT("INF_GetDataField() failed\n"); - return FALSE; - } - Width = wcstoul(Buffer, NULL, 10); - Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, - RegPath, - L"DefaultSettings.XResolution", - REG_DWORD, - &Width, - sizeof(ULONG)); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); - return FALSE; - } - - - if (!INF_GetDataField(&Context, 5, &Buffer)) - { - DPRINT("INF_GetDataField() failed\n"); - return FALSE; - } - Hight = wcstoul(Buffer, 0, 0); - Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, - RegPath, - L"DefaultSettings.YResolution", - REG_DWORD, - &Hight, - sizeof(ULONG)); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); - return FALSE; - } - - if (!INF_GetDataField(&Context, 6, &Buffer)) - { - DPRINT("INF_GetDataField() failed\n"); - return FALSE; - } - Bpp = wcstoul(Buffer, 0, 0); - Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, - RegPath, - L"DefaultSettings.BitsPerPel", - REG_DWORD, - &Bpp, - sizeof(ULONG)); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); - return FALSE; - } - - DPRINT("ProcessDisplayRegistry() done\n"); - - return TRUE; + PGENERIC_LIST_ENTRY Entry; + INFCONTEXT Context; + PWCHAR ServiceName; + ULONG StartValue; + NTSTATUS Status; + WCHAR RegPath [255]; + PWCHAR Buffer; + ULONG Width, Height, Bpp; + + DPRINT("ProcessDisplayRegistry() called\n"); + + Entry = GetGenericListEntry(List); + if (Entry == NULL) + { + DPRINT("GetGenericListEntry() failed\n"); + return FALSE; + } + + if (!SetupFindFirstLineW(InfFile, L"Display", (WCHAR*) Entry->UserData, &Context)) + { + DPRINT("SetupFindFirstLineW() failed\n"); + return FALSE; + } + + /* Enable the right driver */ + if (!INF_GetDataField(&Context, 3, &ServiceName)) + { + DPRINT("INF_GetDataField() failed\n"); + return FALSE; + } + + ASSERT(wcslen(ServiceName) < 10); + DPRINT("Service name: %S\n", ServiceName); + + StartValue = 1; + Status = RtlWriteRegistryValue(RTL_REGISTRY_SERVICES, + ServiceName, + L"Start", + REG_DWORD, + &StartValue, + sizeof(ULONG)); + + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + return FALSE; + } + + /* Set the resolution */ + swprintf(RegPath, L"\\Registry\\Machine\\System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\%s\\Device0", ServiceName); + + if (!INF_GetDataField(&Context, 4, &Buffer)) + { + DPRINT("INF_GetDataField() failed\n"); + return FALSE; + } + + Width = wcstoul(Buffer, NULL, 10); + Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, + RegPath, + L"DefaultSettings.XResolution", + REG_DWORD, + &Width, + sizeof(ULONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + return FALSE; + } + + if (!INF_GetDataField(&Context, 5, &Buffer)) + { + DPRINT("INF_GetDataField() failed\n"); + return FALSE; + } + + Height = wcstoul(Buffer, 0, 0); + Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, + RegPath, + L"DefaultSettings.YResolution", + REG_DWORD, + &Height, + sizeof(ULONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + return FALSE; + } + + if (!INF_GetDataField(&Context, 6, &Buffer)) + { + DPRINT("INF_GetDataField() failed\n"); + return FALSE; + } + + Bpp = wcstoul(Buffer, 0, 0); + Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, + RegPath, + L"DefaultSettings.BitsPerPel", + REG_DWORD, + &Bpp, + sizeof(ULONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + return FALSE; + } + + DPRINT("ProcessDisplayRegistry() done\n"); + + return TRUE; } PGENERIC_LIST CreateKeyboardDriverList(HINF InfFile) { - CHAR Buffer[128]; - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - PWCHAR UserData; - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (!SetupFindFirstLineW (InfFile, L"Keyboard", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, Buffer, UserData, FALSE); - } - while (SetupFindNextLine(&Context, &Context)); - - return List; + CHAR Buffer[128]; + PGENERIC_LIST List; + INFCONTEXT Context; + PWCHAR KeyName; + PWCHAR KeyValue; + PWCHAR UserData; + + List = CreateGenericList(); + if (List == NULL) + return NULL; + + if (!SetupFindFirstLineW (InfFile, L"Keyboard", NULL, &Context)) + { + DestroyGenericList(List, FALSE); + return NULL; + } + + do + { + if (!INF_GetData (&Context, &KeyName, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetData() failed\n"); + break; + } + + UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, + 0, + (wcslen(KeyName) + 1) * sizeof(WCHAR)); + if (UserData == NULL) + { + /* FIXME: Handle error! */ + } + + wcscpy(UserData, KeyName); + + sprintf(Buffer, "%S", KeyValue); + AppendGenericListEntry(List, Buffer, UserData, FALSE); + } while (SetupFindNextLine(&Context, &Context)); + + return List; } PGENERIC_LIST CreateLanguageList(HINF InfFile, WCHAR * DefaultLanguage) -{ - CHAR Buffer[128]; - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - PWCHAR UserData; - - /* Get default language id */ - if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLanguage", &Context)) - return NULL; - - if (!INF_GetData (&Context, NULL, &KeyValue)) - return NULL; - - wcscpy(DefaultLanguage, KeyValue); - +{ + CHAR Buffer[128]; + PGENERIC_LIST List; + INFCONTEXT Context; + PWCHAR KeyName; + PWCHAR KeyValue; + PWCHAR UserData; + + /* Get default language id */ + if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLanguage", &Context)) + return NULL; + + if (!INF_GetData (&Context, NULL, &KeyValue)) + return NULL; + + wcscpy(DefaultLanguage, KeyValue); + SelectedLanguageId = KeyValue; - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (!SetupFindFirstLineW (InfFile, L"Language", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, - Buffer, - UserData, - _wcsicmp(KeyName, DefaultLanguage) ? FALSE : TRUE); - } - while (SetupFindNextLine(&Context, &Context)); - - return List; + List = CreateGenericList(); + if (List == NULL) + return NULL; + + if (!SetupFindFirstLineW (InfFile, L"Language", NULL, &Context)) + { + DestroyGenericList(List, FALSE); + return NULL; + } + + do + { + if (!INF_GetData (&Context, &KeyName, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetData() failed\n"); + break; + } + + UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, + 0, + (wcslen(KeyName) + 1) * sizeof(WCHAR)); + if (UserData == NULL) + { + /* FIXME: Handle error! */ + } + + wcscpy(UserData, KeyName); + + sprintf(Buffer, "%S", KeyValue); + AppendGenericListEntry(List, + Buffer, + UserData, + _wcsicmp(KeyName, DefaultLanguage) ? FALSE : TRUE); + } while (SetupFindNextLine(&Context, &Context)); + + return List; } PGENERIC_LIST CreateKeyboardLayoutList(HINF InfFile, WCHAR * DefaultKBLayout) { - CHAR Buffer[128]; - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - PWCHAR UserData; - - /* Get default layout id */ - if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLayout", &Context)) - return NULL; - - if (!INF_GetData (&Context, NULL, &KeyValue)) - return NULL; - - wcscpy(DefaultKBLayout, KeyValue); - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (!SetupFindFirstLineW (InfFile, L"KeyboardLayout", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - DestroyGenericList(List, FALSE); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, - Buffer, - UserData, - _wcsicmp(KeyName, DefaultKBLayout) ? FALSE : TRUE); - } - while (SetupFindNextLine(&Context, &Context)); - - return List; + CHAR Buffer[128]; + PGENERIC_LIST List; + INFCONTEXT Context; + PWCHAR KeyName; + PWCHAR KeyValue; + PWCHAR UserData; + + /* Get default layout id */ + if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLayout", &Context)) + return NULL; + + if (!INF_GetData (&Context, NULL, &KeyValue)) + return NULL; + + wcscpy(DefaultKBLayout, KeyValue); + + List = CreateGenericList(); + if (List == NULL) + return NULL; + + if (!SetupFindFirstLineW (InfFile, L"KeyboardLayout", NULL, &Context)) + { + DestroyGenericList(List, FALSE); + return NULL; + } + + do + { + if (!INF_GetData (&Context, &KeyName, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetData() failed\n"); + DestroyGenericList(List, FALSE); + break; + } + + UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, + 0, + (wcslen(KeyName) + 1) * sizeof(WCHAR)); + + if (UserData == NULL) + { + /* FIXME: Handle error! */ + } + + wcscpy(UserData, KeyName); + + sprintf(Buffer, "%S", KeyValue); + AppendGenericListEntry(List, + Buffer, + UserData, + _wcsicmp(KeyName, DefaultKBLayout) ? FALSE : TRUE); + } while (SetupFindNextLine(&Context, &Context)); + + return List; } BOOLEAN ProcessKeyboardLayoutRegistry(PGENERIC_LIST List) { - PGENERIC_LIST_ENTRY Entry; - PWCHAR LanguageId; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE KeyHandle; - NTSTATUS Status; - - Entry = GetGenericListEntry(List); - if (Entry == NULL) - return FALSE; - - LanguageId = (PWCHAR)Entry->UserData; - if (LanguageId == NULL) - return FALSE; - - /* Open the nls language key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenKey(&KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - /* Set default language */ - RtlInitUnicodeString(&ValueName, - L"Default"); - Status = NtSetValueKey (KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)(LanguageId + 4), - 8 * sizeof(PWCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - /* Set install language */ - RtlInitUnicodeString(&ValueName, - L"InstallLanguage"); - Status = NtSetValueKey (KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)(LanguageId + 4), - 8 * sizeof(PWCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - NtClose(KeyHandle); - - return TRUE; + PGENERIC_LIST_ENTRY Entry; + PWCHAR LanguageId; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE KeyHandle; + NTSTATUS Status; + + Entry = GetGenericListEntry(List); + if (Entry == NULL) + return FALSE; + + LanguageId = (PWCHAR)Entry->UserData; + if (LanguageId == NULL) + return FALSE; + + /* Open the nls language key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); + return FALSE; + } + + /* Set default language */ + RtlInitUnicodeString(&ValueName, + L"Default"); + + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)(LanguageId + 4), + 8 * sizeof(PWCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + /* Set install language */ + RtlInitUnicodeString(&ValueName, + L"InstallLanguage"); + Status = NtSetValueKey (KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)(LanguageId + 4), + 8 * sizeof(PWCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + NtClose(KeyHandle); + + return TRUE; } @@ -855,7 +865,7 @@ BOOLEAN ProcessKeyboardLayoutFiles(PGENERIC_LIST List) { - return TRUE; + return TRUE; } #endif

1 0

[cfinck] 31647: Fix the indentation mess in "usetup.c"
by cfinck＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: cfinck Date: Mon Jan 7 19:50:40 2008 New Revision: 31647 URL: http://svn.reactos.org/svn/reactos?rev=31647&view=rev Log: Fix the indentation mess in "usetup.c" Modified: trunk/reactos/base/setup/usetup/interface/usetup.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac…

1 0

[akorotaev] 31646: - Merge procsup.c - Fix bugcheck by replacing MmCreateVirtualMapping with MmCreateVirtualMappingUnsafe (which is used it trunk). Now you can pass 1st stage setup with this branch.
by akorotaev＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: akorotaev Date: Mon Jan 7 19:45:24 2008 New Revision: 31646 URL: http://svn.reactos.org/svn/reactos?rev=31646&view=rev Log: - Merge procsup.c - Fix bugcheck by replacing MmCreateVirtualMapping with MmCreateVirtualMappingUnsafe (which is used it trunk). Now you can pass 1st stage setup with this branch. Modified: branches/cache_manager_rewrite/mm/procsup.c branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/procsu… ============================================================================== --- branches/cache_manager_rewrite/mm/procsup.c (original) +++ branches/cache_manager_rewrite/mm/procsup.c Mon Jan 7 19:45:24 2008 @@ -15,8 +15,8 @@ extern ULONG NtMajorVersion; extern ULONG NtMinorVersion; -extern ULONG NtOSCSDVersion; -extern ULONG NtGlobalFlag; +extern ULONG CmNtCSDVersion; +extern ULONG NtBuildNumber; extern MM_SYSTEMSIZE MmSystemSize; #define MM_HIGHEST_VAD_ADDRESS \ @@ -40,7 +40,7 @@ } /* Save the old priority and update it */ - OldPriority = Process->Vm.Flags.MemoryPriority; + OldPriority = (UCHAR)Process->Vm.Flags.MemoryPriority; Process->Vm.Flags.MemoryPriority = MemoryPriority; /* Return the old priority */ @@ -166,7 +166,7 @@ /* Lock the Address Space */ MmLockAddressSpace(ProcessAddressSpace); - + MemoryArea = MmLocateMemoryAreaByAddress(ProcessAddressSpace, (PVOID)Teb); if (MemoryArea) { @@ -180,7 +180,8 @@ PVOID STDCALL -MmCreateKernelStack(BOOLEAN GuiStack) +MmCreateKernelStack(BOOLEAN GuiStack, + UCHAR Node) { PMEMORY_AREA StackArea; ULONG i; @@ -241,8 +242,9 @@ KEBUGCHECK(0); } - /* Return the stack */ - return KernelStack; + /* Return the stack base */ + return (PVOID)((ULONG_PTR)KernelStack + + (GuiStack ? KERNEL_LARGE_STACK_SIZE : KERNEL_STACK_SIZE)); } /* @@ -258,7 +260,7 @@ ASSERT(((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit) <= (KERNEL_LARGE_STACK_SIZE + PAGE_SIZE)); - /* + /* * We'll give you three more pages. * NOTE: See note in MmCreateKernelStack. These pages are already being reserved. * It would be more efficient to only grow them (commit them) here. @@ -329,9 +331,9 @@ /* Default Version Data (could get changed below) */ Peb->OSMajorVersion = NtMajorVersion; Peb->OSMinorVersion = NtMinorVersion; - Peb->OSBuildNumber = 2195; + Peb->OSBuildNumber = (USHORT)(NtBuildNumber & 0x3FFF); Peb->OSPlatformId = 2; /* VER_PLATFORM_WIN32_NT */ - Peb->OSCSDVersion = NtOSCSDVersion; + Peb->OSCSDVersion = (USHORT)CmNtCSDVersion; /* Heap and Debug Data */ Peb->NumberOfProcessors = KeNumberProcessors; @@ -463,6 +465,11 @@ Teb->DeallocationStack = InitialTeb->AllocatedStackBase; } + /* Initialize the static unicode string */ + Teb->StaticUnicodeString.Length = 0; + Teb->StaticUnicodeString.MaximumLength = sizeof(Teb->StaticUnicodeBuffer); + Teb->StaticUnicodeString.Buffer = Teb->StaticUnicodeBuffer; + /* Return TEB Address */ DPRINT("Allocated: %x\n", Teb); if (Attached) KeDetachProcess(); @@ -470,10 +477,37 @@ } NTSTATUS -STDCALL -MmCreateProcessAddressSpace(IN PEPROCESS Process, - IN PROS_SECTION_OBJECT Section OPTIONAL, - IN POBJECT_NAME_INFORMATION *AuditName OPTIONAL) +NTAPI +MmInitializeHandBuiltProcess2(IN PEPROCESS Process) +{ + PVOID BaseAddress; + PMEMORY_AREA MemoryArea; + PHYSICAL_ADDRESS BoundaryAddressMultiple; + NTSTATUS Status; + PMADDRESS_SPACE ProcessAddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; + BoundaryAddressMultiple.QuadPart = 0; + + /* Create the shared data page */ + BaseAddress = (PVOID)USER_SHARED_DATA; + Status = MmCreateMemoryArea(ProcessAddressSpace, + MEMORY_AREA_SHARED_DATA, + &BaseAddress, + PAGE_SIZE, + PAGE_EXECUTE_READ, + &MemoryArea, + FALSE, + 0, + BoundaryAddressMultiple); + return Status; +} + +NTSTATUS +NTAPI +MmInitializeProcessAddressSpace(IN PEPROCESS Process, + IN PEPROCESS ProcessClone OPTIONAL, + IN PVOID Section OPTIONAL, + IN OUT PULONG Flags, + IN POBJECT_NAME_INFORMATION *AuditName OPTIONAL) { NTSTATUS Status; PMADDRESS_SPACE ProcessAddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; @@ -482,6 +516,7 @@ PHYSICAL_ADDRESS BoundaryAddressMultiple; SIZE_T ViewSize = 0; PVOID ImageBase = 0; + PROS_SECTION_OBJECT SectionObject = Section; BoundaryAddressMultiple.QuadPart = 0; /* Initialize the Addresss Space */ @@ -545,7 +580,7 @@ Process->HasAddressSpace = TRUE; /* Check if there's a Section Object */ - if (Section) + if (SectionObject) { UNICODE_STRING FileName; PWCHAR szSrc; @@ -557,7 +592,7 @@ MmUnlockAddressSpace(ProcessAddressSpace); DPRINT("Mapping process image. Section: %p, Process: %p, ImageBase: %p\n", - Section, Process, &ImageBase); + SectionObject, Process, &ImageBase); Status = MmMapViewOfSection(Section, (PEPROCESS)Process, (PVOID*)&ImageBase, @@ -579,7 +614,7 @@ /* Determine the image file name and save it to EPROCESS */ DPRINT("Getting Image name\n"); - FileName = Section->FileObject->FileName; + FileName = SectionObject->FileObject->FileName; szSrc = (PWCHAR)(FileName.Buffer + FileName.Length); while (szSrc >= FileName.Buffer) { @@ -607,7 +642,7 @@ if (AuditName) { /* Setup the audit name */ - SeInitializeProcessAuditName(Section->FileObject, + SeInitializeProcessAuditName(SectionObject->FileObject, FALSE, AuditName); } @@ -632,7 +667,7 @@ /* FIXME: Add part of MmDeleteProcessAddressSpace here */ } -NTSTATUS +NTSTATUS NTAPI MmDeleteProcessAddressSpace(PEPROCESS Process) { Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Mon Jan 7 19:45:24 2008 @@ -994,11 +994,11 @@ * Just map the desired physical page */ Pfn = (Offset + MemoryArea->Data.SectionData.ViewOffset) >> PAGE_SHIFT; - Status = MmCreateVirtualMapping(AddressSpace->Process, - Address, - Region->Protect, - &Pfn, - 1); + Status = MmCreateVirtualMappingUnsafe(AddressSpace->Process, + Address, + Region->Protect, + &Pfn, + 1); if (!NT_SUCCESS(Status)) { DPRINT("MmCreateVirtualMapping failed, not out of memory\n"); @@ -5597,7 +5597,6 @@ CHECKPOINT1; return STATUS_INVALID_PAGE_PROTECTION; } - Section = (PROS_SECTION_OBJECT)SectionObject; AddressSpace = (PMADDRESS_SPACE)&(Process)->VadRoot;

1 0

[fireball] 31645: - Add declaration for KdChangeOption exported native API.
by fireball＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: fireball Date: Mon Jan 7 19:12:48 2008 New Revision: 31645 URL: http://svn.reactos.org/svn/reactos?rev=31645&view=rev Log: - Add declaration for KdChangeOption exported native API. Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Mon Jan 7 19:12:48 2008 @@ -10998,6 +10998,19 @@ KdEnableDebugger( VOID); +#if (NTDDI_VERSION >= NTDDI_WS03SP1) +NTKERNELAPI +NTSTATUS +NTAPI +KdChangeOption( + IN KD_OPTION Option, + IN ULONG InBufferBytes OPTIONAL, + IN PVOID InBuffer, + IN ULONG OutBufferBytes OPTIONAL, + OUT PVOID OutBuffer, + OUT PULONG OutBufferNeeded OPTIONAL); +#endif + VOID NTAPI DbgBreakPoint(

1 0

[hpoussin] 31644: Update irot.idl Misc cleanup
by hpoussin＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: hpoussin Date: Mon Jan 7 18:17:48 2008 New Revision: 31644 URL: http://svn.reactos.org/svn/reactos?rev=31644&view=rev Log: Update irot.idl Misc cleanup Modified: trunk/reactos/include/reactos/idl/idl.rbuild trunk/reactos/include/reactos/idl/wtypes.idl trunk/reactos/include/reactos/wine/irot.idl trunk/reactos/include/reactos/wine/wineheaders.rbuild Modified: trunk/reactos/include/reactos/idl/idl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/idl.rb… ============================================================================== --- trunk/reactos/include/reactos/idl/idl.rbuild (original) +++ trunk/reactos/include/reactos/idl/idl.rbuild Mon Jan 7 18:17:48 2008 @@ -2,43 +2,27 @@ <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="pnp_server" type="rpcserver" allowwarnings="true"> - <include base="ReactOS">.</include> - <include base="ReactOS">w32api/include</include> <file>pnp.idl</file> </module> <module name="pnp_client" type="rpcclient"> - <include base="ReactOS">.</include> - <include base="ReactOS">w32api/include</include> <file>pnp.idl</file> </module> <module name="scm_server" type="rpcserver"> - <include base="ReactOS">.</include> - <include base="ReactOS">w32api/include</include> <file switches="--oldnames">svcctl.idl</file> </module> <module name="scm_client" type="rpcclient"> - <include base="ReactOS">.</include> - <include base="ReactOS">w32api/include</include> <file switches="--oldnames">svcctl.idl</file> </module> <module name="eventlog_server" type="rpcserver" allowwarnings="true"> - <include base="ReactOS">.</include> - <include base="ReactOS">w32api/include</include> <file switches="--oldnames">eventlogrpc.idl</file> </module> <module name="eventlog_client" type="rpcclient" > - <include base="ReactOS">.</include> - <include base="ReactOS">w32api/include</include> <file switches="--oldnames">eventlogrpc.idl</file> </module> <module name="lsa_server" type="rpcserver"> - <include base="ReactOS">.</include> - <include base="ReactOS">w32api/include</include> <file switches="--oldnames">lsa.idl</file> </module> <module name="lsa_client" type="rpcclient"> - <include base="ReactOS">.</include> - <include base="ReactOS">w32api/include</include> <file switches="--oldnames">lsa.idl</file> </module> </group> Modified: trunk/reactos/include/reactos/idl/wtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wtypes… ============================================================================== --- trunk/reactos/include/reactos/idl/wtypes.idl (original) +++ trunk/reactos/include/reactos/idl/wtypes.idl Mon Jan 7 18:17:48 2008 @@ -11,4 +11,4 @@ #define LPDWORD unsigned long* #define PBOOL unsigned long* -#define NTSTATUS long +#define NTSTATUS long Modified: trunk/reactos/include/reactos/wine/irot.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/irot.… ============================================================================== --- trunk/reactos/include/reactos/wine/irot.idl (original) +++ trunk/reactos/include/reactos/wine/irot.idl Mon Jan 7 18:17:48 2008 @@ -18,8 +18,8 @@ import "wtypes.idl"; -cpp_quote("#define IROT_PROTSEQ {'n','c','a','l','r','p','c',0}"); -cpp_quote("#define IROT_ENDPOINT {'i','r','o','t',0}"); +cpp_quote("#define IROT_PROTSEQ {'n','c','a','l','r','p','c',0}") +cpp_quote("#define IROT_ENDPOINT {'i','r','o','t',0}") typedef struct tagMonikerComparisonData { ULONG ulCntData; @@ -51,6 +51,7 @@ typedef DWORD IrotCookie; typedef handle_t IrotHandle; + typedef [context_handle] void *IrotContextHandle; HRESULT IrotRegister( [in] IrotHandle h, @@ -59,11 +60,13 @@ [in] const InterfaceData *moniker, [in] const FILETIME *time, [in] DWORD grfFlags, - [out] IrotCookie *cookie); + [out] IrotCookie *cookie, + [out] IrotContextHandle *ctxt_handle); HRESULT IrotRevoke( [in] IrotHandle h, [in] IrotCookie cookie, + [in, out] IrotContextHandle *ctxt_handle, [out] PInterfaceData *object, [out] PInterfaceData *moniker); Modified: trunk/reactos/include/reactos/wine/wineheaders.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wineh… ============================================================================== --- trunk/reactos/include/reactos/wine/wineheaders.rbuild (original) +++ trunk/reactos/include/reactos/wine/wineheaders.rbuild Mon Jan 7 18:17:48 2008 @@ -1,6 +1,5 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="wineheaders" type="idlheader"> - <file>irot.idl</file> <file>itss.idl</file> </module>

1 0

[dchapyshev] 31643: - Add Russian translation
by dchapyshev＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: dchapyshev Date: Mon Jan 7 18:08:18 2008 New Revision: 31643 URL: http://svn.reactos.org/svn/reactos?rev=31643&view=rev Log: - Add Russian translation Added: trunk/reactos/dll/win32/modemui/lang/ru-RU.rc (with props) Modified: trunk/reactos/dll/win32/modemui/modemui.rc Added: trunk/reactos/dll/win32/modemui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/modemui/lang/ru-RU.rc (added) +++ trunk/reactos/dll/win32/modemui/lang/ru-RU.rc Mon Jan 7 18:08:18 2008 @@ -1,0 +1,613 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDM_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Äóáëèðîâàòü...", 0 + MENUITEM "&Óäàëèòü", 1 + MENUITEM "&Ïðîñìîòð æóðíàëà", 2 + MENUITEM SEPARATOR + MENUITEM "Ñâî&éñòâà", 3 + MENUITEM "&Êîïèðîâàòü ñâîéñòâà", 4 + MENUITEM "Ïðè&ìåíèòü ñâîéñòâà", 5 + END +END + +IDD_ADVANCED DIALOG 17, 12, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Äîïîëíèòåëüíî" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Äîïîëíèòåëüíûå ïàðàìåòðû", 1018, 6, 6, 225, 70 + LTEXT "Ä&îïîëíèòåëüíûå êîìàíäû èíèöèàëèçàöèè:", 1011, 16, 20, 143, 8 + EDITTEXT 1016, 16, 31, 205, 13, ES_AUTOHSCROLL + LTEXT "&Æäàòü ñèãíàëà äëÿ òåëåôîííîé êàðòî÷êè:", 1007, 16, 55, 109, 8, NOT WS_VISIBLE + EDITTEXT 1008, 133, 52, 26, 12, ES_RIGHT | NOT WS_VISIBLE | WS_GROUP + CONTROL "", 1009, "MSCTLS_UPDOWN32", NOT WS_VISIBLE | WS_BORDER | WS_GROUP | 0x00000036, 159, 52, 12, 12 + LTEXT "ñåê.", 1010, 173, 54, 40, 8, NOT WS_VISIBLE + GROUPBOX "&Âûáîð ñòðàíû èëè ðåãèîíà", 1012, 6, 80, 225, 75 + COMBOBOX 1013, 18, 99, 203, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP + PUSHBUTTON "&Äîïîëíèòåëüíûå ïàðàìåòðû...", 1100, 107, 170, 125, 14 + DEFPUSHBUTTON "&Èçìåíèòü óìîë÷àíèÿ...", 3, 107, 188, 125, 14 +END + +IDD_GENERAL DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Îáùèå" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ïîðò:", 1018, 9, 8, 32, 10 + LTEXT "Ïîñëåäîâàòåëüíûé ïîðò", 1095, 48, 8, 181, 10 + GROUPBOX "&Ãðîìêîñòü äèíàìèêà", 1029, 10, 21, 218, 48 + CONTROL "", 1032, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000001, 84, 40, 66, 20 + RTEXT "Âûêë.", 1045, 56, 40, 22, 8 + LTEXT "Âûøå", 1001, 155, 40, 25, 11 + GROUPBOX "&Ñêîðîñòü ïîðòà äëÿ ìîäåìà", 1031, 10, 78, 218, 46 + COMBOBOX 1036, 18, 100, 202, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "Óïðàâëåíèå íàáîðîì íîìåðà", 1060, 10, 133, 218, 51 + AUTOCHECKBOX "&Äîæäàòüñÿ ñèãíàëà ""Ëèíèÿ ñâîáîäíà""", 1003, 27, 157, 174, 10 +END + +IDD_DISTINCTIVE_RING DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ðàçëè÷åíèå çâîíêîâ" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", 1068, 10, 7, 218, 145 + AUTOCHECKBOX "&Èñïîëüçîâàòü ñëóæáû ðàçëè÷åíèÿ çâîíêîâ", 1069, 20, 7, 184, 10 + CTEXT "Âèä çâîíêà", -1, 84, 21, 70, 8 + CTEXT "Òèï âûçîâà", -1, 159, 21, 63, 8 + LTEXT "&Îñíîâíîé àäðåñ:", 1070, 20, 41, 62, 8 + COMBOBOX 1073, 84, 37, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1082, 160, 37, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Àäðåñ &1:", 1071, 20, 59, 62, 8 + COMBOBOX 1074, 84, 55, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1083, 160, 55, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Àäðåñ &2:", 1072, 20, 77, 62, 8 + COMBOBOX 1075, 84, 73, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1084, 160, 73, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Àäðåñ &3:", 1076, 20, 95, 62, 8 + COMBOBOX 1077, 84, 91, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1085, 160, 91, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "&Ïðèîðèòåòíûå âûçîâû:", 1078, 20, 112, 62, 8 + COMBOBOX 1079, 84, 109, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1086, 160, 109, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Î&òâåòíûé âûçîâ:", 1080, 20, 131, 62, 8 + COMBOBOX 1081, 84, 127, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1087, 160, 127, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP +END + +IDD_DISTINCTIVE_RING_2 DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ðàçëè÷åíèå çâîíêîâ" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", 1068, 10, 7, 218, 87 + AUTOCHECKBOX "&Èñïîëüçîâàòü ñëóæáû ðàçëè÷åíèÿ çâîíêîâ", 1069, 19, 7, 177, 10 + CTEXT "Âèä çâîíêà", -1, 20, 21, 74, 8 + CTEXT "Òèï âûçîâà", -1, 96, 21, 65, 8 + LTEXT "&Îäèíî÷íûé çâîíîê:", 1088, 20, 37, 53, 8 + COMBOBOX 1091, 96, 37, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "&Äâîéíîé çâîíîê:", 1089, 20, 57, 53, 8 + COMBOBOX 1092, 96, 55, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "&Òðîéíîé çâîíîê:", 1090, 20, 76, 53, 8 + COMBOBOX 1093, 96, 73, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP +END + +IDD_DIAGNOSTICS DIALOG 0, 0, 238, 215 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Äèàãíîñòèêà" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", 1042, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 18, 200, 58 + CONTROL "", 1041, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 84, 200, 58 + PUSHBUTTON "Îïðî&ñèòü ìîäåì", 1096, 138, 149, 75, 14 + AUTOCHECKBOX "Âåñòè &æóðíàë", 1020, 18, 187, 98, 10 + PUSHBUTTON "&Ïðîñìîòð æóðíàëà", 1094, 138, 184, 75, 14, WS_DISABLED + GROUPBOX "Ñâåäåíèÿ î ìîäåìå", 1047, 10, 6, 217, 164 + GROUPBOX "Âåäåíèå æóðíàëà", -1, 10, 173, 217, 32 +END + +IDD_PLEASE_WAIT DIALOG 0, 0, 195, 72 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Ïîæàëóéñòà, ïîäîæäèòå..." +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "Èäåò îáìåí äàííûìè ñ ìîäåìîì. Ýòî ìîæåò çàíÿòü íåñêîëüêî ñåêóíä.", -1, 42, 7, 146, 28 + DEFPUSHBUTTON "Îòìåíà", 2, 72, 52, 50, 14 +END + +IDD_GENERAL_2 DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Îáùèå" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "&Ðó÷íîé èëè ïîëóàâòîìàòè÷åñêèé íàáîð íîìåðà", 1002, 19, 22, 180, 10 + AUTOCHECKBOX "Îòêë&þ÷åíèå ïðè ïðîñòîå áîëåå", 1042, 19, 38, 143, 10 + EDITTEXT 1043, 168, 35, 25, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "Î&òìåíà âûçîâà ïðè îòñóòñòâèè ñâÿçè", -1, 19, 56, 147, 10 + EDITTEXT 1040, 168, 54, 25, 13, ES_AUTOHSCROLL | ES_NUMBER + RTEXT "&Ñêîðîñòü ïîðòà:", 1034, 16, 102, 93, 8 + COMBOBOX 1036, 114, 100, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Ïðîòîêîë:", 1032, 16, 122, 93, 8 + COMBOBOX 1037, 114, 119, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "Ñ&æàòèå:", 1035, 16, 139, 93, 8 + COMBOBOX 1099, 114, 137, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Óïðàâëåíèå ïîòîêîì:", 1027, 16, 157, 93, 8 + COMBOBOX 1031, 114, 155, 84, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "Ïàðàìåòðû âûçîâà", 1060, 11, 7, 217, 66 + LTEXT "ìèí.", 1044, 195, 38, 22, 8 + LTEXT "ñåê.", 1041, 195, 56, 22, 8 + GROUPBOX "Ïàðàìåòðû ïîäêëþ÷åíèÿ ëèíèè äàííûõ", -1, 11, 82, 217, 94 +END + +IDD_ADVANCED_2 DIALOG 17, 12, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Äîïîëíèòåëüíî" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "Îòêðûòü îêíî òåðìèíàëà &äî íàáîðà íîìåðà", 1000, 20, 21, 200, 10 + AUTOCHECKBOX "Îòêðûòü îêíî òåðìèíàëà &ïîñëå íàáîðà íîìåðà", 1001, 20, 38, 200, 10 + RTEXT "&Áèòû äàííûõ:", 1024, 18, 79, 93, 8 + COMBOBOX 1025, 114, 77, 106, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&×åòíîñòü:", 1026, 18, 97, 93, 8 + COMBOBOX 1028, 114, 95, 106, 60, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "Ñ&òîïîâûå áèòû:", 1029, 18, 115, 93, 8 + COMBOBOX 1030, 114, 113, 106, 45, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Ìîäóëÿöèÿ:", 1045, 18, 133, 93, 8 + COMBOBOX 1038, 114, 131, 106, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "Îêíî òåðìèíàëà", 1004, 10, 7, 217, 49 + GROUPBOX "Ïàðàìåòðû íàñòðîéêè îáîðóäîâàíèÿ", 1005, 10, 64, 217, 89 +END + +IDD_ISDN DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ISDN" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Òèï êîììóòàòîðà", -1, 11, 6, 217, 39 + COMBOBOX 1104, 17, 20, 204, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "&Ïåðâûé íîìåð", -1, 11, 50, 217, 50 + EDITTEXT 1017, 33, 62, 188, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "S&PID/EAZ:", 1027, 34, 83, 67, 8 + EDITTEXT 1107, 104, 79, 117, 13, ES_AUTOHSCROLL | ES_NUMBER + GROUPBOX "&Âòîðîé íîìåð", -1, 11, 105, 217, 49 + EDITTEXT 1018, 33, 114, 189, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "SPI&D/EAZ:", 1028, 35, 135, 68, 8 + EDITTEXT 1108, 105, 132, 117, 13, ES_AUTOHSCROLL | ES_NUMBER +END + +IDD_PLEASE_WAIT_2 DIALOG 0, 0, 195, 72 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Ïîæàëóéñòà, ïîäîæäèòå" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "Îòïðàâêà íà ìîäåì ñâåäåíèé î ñòðàíå èëè ðåãèîíå.", -1, 42, 7, 146, 28 +END + +IDD_WARNING DIALOG 0, 0, 360, 105 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "Ïðåäóïðåæäåíèå" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "Íå âûâîäèòü ýòî ñîîáùåíèå â äàëüíåéøåì", 1109, 17, 73, 175, 10 + DEFPUSHBUTTON "OK", 1, 302, 84, 50, 14 + LTEXT "Íåêîòîðûå ìîäåìû íå óìåþò îáðàáàòûâàòü ñòîëü äëèííûå ñòðîêè èíèöèàëèçàöèè.", -1, 50, 27, 304, 8 + LTEXT "Ñâåäåíèÿ îá îãðàíè÷åíèÿõ âàøåãî ìîäåìà ìîæíî ïîëó÷èòü ó èçãîòîâèòåëÿ.", -1, 50, 41, 304, 8 + ICON 5100, -1, 15, 14, 20, 20 + LTEXT "Ââåäåííàÿ ñòðîêà èíèöèàëèçàöèè ìîäåìà äëèííåå 57 çíàêîâ.", -1, 50, 14, 304, 8 +END + +IDD_MODEMS DIALOG 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ìîäåìû" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, 1057, 6, 7, 20, 20 + LTEXT "Íà êîìïüþòåðå óñòàíîâëåíû ñëåäóþùèå ìîä&åìû:", -1, 44, 12, 203, 9 + CONTROL "", 113, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00000849, 7, 32, 238, 158, WS_EX_CLIENTEDGE + PUSHBUTTON "&Äîáàâèòü...", 110, 56, 198, 60, 14 + PUSHBUTTON "&Óäàëèòü", 112, 121, 198, 60, 14 + PUSHBUTTON "Ñâî&éñòâà", 109, 185, 198, 60, 14 +END + +IDD_PLEASE_WAIT_3 DIALOG 0, 0, 195, 72 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Ïîæàëóéñòà, ïîäîæäèòå..." +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Î&ñòàíîâèòü", 2, 74, 53, 50, 14 + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "Óäàëåíèå", -1, 40, 8, 151, 8 + LTEXT "Ìîäåì", 1005, 40, 16, 151, 25 +END + +STRINGTABLE +BEGIN + 180 "Ïîñëåäîâàòåëüíûé ïîðò RS-232" + 181 "Âíåøíèé ìîäåì" + 182 "Âíóòðåííèé ìîäåì" + 183 "Ìîäåì PCMCIA" + 184 "Ïàðàëëåëüíûé ìîäåì" + 185 "Ïàðàëëåëüíûé ïîðò" + 200 "110" + 201 "1200" + 202 "2400" + 203 "4800" + 204 "9600" + 206 "19200" + 207 "38400" + 210 "115200" + 211 "57600" + 216 "300" + 220 "230400" + 221 "460800" + 222 "921600" + 240 "4" + 241 "5" + 242 "6" + 243 "7" + 244 "8" + 250 "×åò" + 251 "Íå÷åò" + 252 "Íå ïðîâåðÿåòñÿ" + 253 "Ìàðêåð (1)" + 254 "Ïðîáåë (0)" + 255 "1" + 256 "1,5" + 257 "2" + 260 "Xon/Xoff" + 261 "Àïïàðàòíîå" + 262 "Îòñóòñòâóåò" + 263 "Âêë." + 264 "Íèæå" + 265 "V.23 (Minitel)" + 266 "Ñòàíäàðòíàÿ" + 267 "Íåñòàíäàðòíàÿ (Bell, HST)" + 270 "Ä&îáàâèòü â æóðíàë" + 300 "Íå îïðåäåëåí" + 301 "Äàííûå" + 302 "Ôàêñ" + 303 "Ðå÷ü" + 304 "Íåò" + 320 "Ïàðàìåòðû ñòðàíû èëè ðåãèîíà îáíîâëåíû" + 340 "Ìîäåì" + 341 "Ïàðàìåòðû ìîäåìà" + 342 "Àäðåñ ìîäåìà" + 400 "Ïàðàìåòðû ñòðàíû èëè ðåãèîíà íå îáíîâëåíû" + 401 "Íåêîòîðûå ìîäåìû íå ïðèíèìàþò êîìàíäû èíèöèàëèçàöèè, åñëè ñòðîêà êîìàíäû äëèííåå 57 ñèìâîëîâ.\n\nÑâåäåíèÿ îá îãðàíè÷åíèÿõ äëÿ âàøåãî ìîäåìà ìîæíî ïîëó÷èòü ó èçãîòîâèòåëÿ." + 402 "Ïðåäóïðåæäåíèå" + 460 "Íåäîñòàòî÷íî ïàìÿòè äëÿ ïðîñìîòðà îáùèõ ñâîéñòâ.\nÇàêðîéòå ÷àñòü ïðîãðàìì è ôàéëîâ è ïîâòîðèòå ïîïûòêó." + 461 "Íåäîñòàòî÷íî ïàìÿòè äëÿ ïðîñìîòðà ïàðàìåòðîâ ìîäåìà.\nÇàêðîéòå ÷àñòü ïðîãðàìì è ôàéëîâ è ïîâòîðèòå ïîïûòêó." + 463 "Êàæäûé àäðåñ âûçîâà äîëæåí áûòü 'Àâòîìàòè÷åñêèì' èëè èìåòü óíèêàëüíûé âèä çâîíêà.\n\nÈçìåíèòå ïîâòîðÿþùèéñÿ âèä çâîíêà íà äðóãîå çíà÷åíèå." + 465 "Ñòàíäàðòíûé EC" + 466 "Ôîðñèðîâàííûé EC" + 467 "Ñîòîâûé" + 468 "Îòêëþ÷åí" + 469 "Âêëþ÷åíî" + 470 "Îòêëþ÷åíî" + 480 "ÀÂÒÎ (1 êàí.)" + 481 "ÀÂÒÎ (2 êàí.)" + 482 "PPP (56K)" + 483 "PPP (64K)" + 484 "PPP (112K)" + 485 "PPP (112K,PAP)" + 486 "PPP (112K,CHAP)" + 487 "PPP (112K,MSCHAP)" + 488 "PPP (128K)" + 489 "PPP (128K,PAP)" + 490 "PPP (128K,CHAP)" + 491 "PPP (128K,MSCHAP)" + 500 "V.120 (64K)" + 501 "V.120 (56K)" + 502 "V.120 (112K)" + 503 "V.120 (128K)" + 504 "X.75 (64K)" + 505 "X.75 (128K)" + 506 "X.75 (T.70)" + 507 "X.75 (BTX)" + 508 "V.110 (1.2K)" + 509 "V.110 (2.4K)" + 510 "V.110 (4.8K)" + 511 "V.110 (9.6K)" + 512 "V.110 (12.0K)" + 513 "V.110 (14.4K)" + 514 "V.110 (19.2K)" + 515 "V.110 (28.8K)" + 516 "V.110 (38.4K)" + 517 "V.110 (57.6K)" + 518 "Àíàëîãîâûé (V.34/V.90)" + 550 "ESS5 (AT&T) (Ñåâåðíàÿ Àìåðèêà)" + 551 "ÀÒÒ ò&î÷êà - ìíîãèå òî÷êè" + 552 "National ISDN 1 (NI-1)" + 553 "Northern Telecom DMS 100 (NT1)" + 554 "NTT INS64 (ßïîíèÿ)" + 555 "European ISDN (DSS1) (Åâðîïà)" + 556 "German National (1TR6) (ðåäêî èñïîëüçóåìûé)" + 557 "French National (VN3) (ðåäêî èñïîëüçóåìûé)" + 558 "Belgium National (ðåäêî èñïîëüçóåìûé)" + 559 "Australian National (ðåäêî èñïîëüçóåìûé)" + 560 "Íåèçâåñòíûé êîììóòàòîð" + 570 "Íàñòðîéêà ISDN äëÿ ýòîãî ìîäåìà\n íå çàâåðøåíà.\n\nÇàïîëíèòå ñâåäåíèÿ íà âêëàäêå\nISDN ïåðåä èñïîëüçîâàíèåì ìîäåìà." + 600 "PPP (56K,GSM)" + 601 "PPP (64K,GSM)" + 602 "V.120 (64K,GSM)" + 604 "V.110 (1.2K,GSM)" + 605 "V.110 (2.4K,GSM)" + 606 "V.110 (4.8K,GSM)" + 607 "V.110 (9.6K,GSM)" + 608 "V.110 (12.0K,GSM)" + 609 "V.110 (14.4K,GSM)" + 610 "V.110 (19.2K,GSM)" + 611 "V.110 (28.8K,GSM)" + 612 "V.110 (38.4K,GSM)" + 613 "V.110 (57.6K,GSM)" + 614 "Àíàëîãîâûé RLP" + 615 "Àíàëîãîâûé NRLP" + 616 "GPRS" + 617 "PIAFS - âõîäÿùèé" + 618 "PIAFS - èñõîäÿùèé" + 700 "Èñïîëüçîâàòü òåêóùåå ìåñòîïîëîæåíèÿ èç TAPI" + 2006 "Ïîäêëþ÷åí ê" + 2007 "Îòñóòñòâóåò" + 2008 "Íå ðàáîòàåò" + 2009 "Òðåáóåòñÿ ïåðåçàãðóçêà" + 2010 "#Äëÿ çàâåðøåíèÿ óñòàíîâêè ìîäåìà òðåáóåòñÿ ïåðåçàãðóçèòü êîìïüþòåð.\n\nÏåðåçàãðóçèòü êîìïüþòåð ïðÿìî ñåé÷àñ?" + 2011 "Ìîäåì óñòàíîâëåí íåïðàâèëüíî" + 2012 "Íåèçâåñòíûé ïîðò" + 3000 "Óñòàíîâêà ìîäåìà" + 3018 "Ìîäåìû" + 3019 "Óñòàíîâêà íîâîãî ìîäåìà è èçìåíåíèå åãî ïàðàìåòðîâ." + 3053 "Îòîáðàæåíèå ñâîéñòâ ìîäåìà íåâîçìîæíî, òàê êàê ìîäåì íåäîñòóïåí.\n\nÏåðåçàãðóçèòå ñèñòåìó è ïîâòîðèòå ïîïûòêó." + 3054 "Ñâîéñòâà: Ìîäåìû" + 3060 "Óäàëèòü âûáðàííûå ìîäåìû èç ñèñòåìû?" + 3061 "Íå óäàëîñü óäàëèòü ìîäåì '%1' èç ñèñòåìû (ïîðò %2)." + 3062 "Ìîäåì" + 3069 "Íåäîñòàòî÷íî ïàìÿòè äëÿ îòêðûòèÿ ïðîãðàììû íàñòðîéêè ìîäåìîâ ïàíåëè óïðàâëåíèÿ.\n\nÇàêðîéòå íåíóæíûå ïðîãðàììû è ïîâòîðèòå ïîïûòêó." + 3073 "Óñòàíîâêà ìîäåìîâ ðàçðåøåíà òîëüêî ñèñòåìíûì àäìèíèñòðàòîðàì." + 3074 "Íè îäíîãî ìîäåìà íå óñòàíîâëåíî. Óñòàíîâêà ìîäåìîâ ðàçðåøåíà òîëüêî ñèñòåìíûì àäìèíèñòðàòîðàì." + 3076 "Âíåñåííûå èçìåíåíèÿ âñòóïÿò â ñèëó òîëüêî ïîñëå ïåðåçàãðóçêè êîìïüþòåðà.\n\nÂûïîëíèòü ïåðåçàãðóçêó ñåé÷àñ?" + 3077 "Èçìåíåíèå ïàðàìåòðîâ ñåòè" + 3200 "300 áîä" + 3201 "1200 áîä" + 3202 "2400 áîä" + 3203 "9600 áîä" + 3204 "19,2K áîä" + 3205 "38,4K áîä" + 3206 "57,6K áîä" + 3207 "Íåò îòâåòà" + 3212 "Êîìàíäà" + 3213 "Îòâåò" + 3214 "Íå óäàëîñü îòêðûòü ïîðò, ê êîòîðîìó ïîäêëþ÷åí ìîäåì. Ýòî ìîæåò áûòü ðåçóëüòàòîì êîíôëèêòà îáîðóäîâàíèÿ. Ïðîâåðüòå ñ ïîìîùüþ äèñïåò÷åðà óñòðîéñòâ, ÷òî âñå óñòðîéñòâà ðàáîòàþò íîðìàëüíî." + 3215 "Ïîðò, èñïîëüçóåìûé ìîäåìîì â äàííûé ìîìåíò îòêðûò äðóãèì ïðèëîæåíèåì. Çàêðîéòå âñå ïðèëîæåíèÿ, êîòîðûå ìîãóò èñïîëüçîâàòü ýòîò ïîðò." + 3218 "OpenComm" + 3221 "115K áîä" + 3222 "Îáíîâëåíèå" + 3223 "Îøèáêà" + 3233 "Óñïåøíî" + 3236 "Ýòîò ìîäåì íå îòâå÷àåò. Ïðîâåðüòå, ÷òî îí ïðàâèëüíî ïîäêëþ÷åí è ïèòàíèå âêëþ÷åíî. Åñëè ýòî âíóòðåííèé ìîäåì, èëè åñëè îí ïîäêëþ÷åí ïðàâèëüíî, ïðîâåðüòå, ÷òî äëÿ ïîðòà âûáðàíî ïðàâèëüíîå ïðåðûâàíèå." + 3237 "ÊÎÌÀÍÄÀ ÍÅ ÏÎÄÄÅÐÆÈÂÀÅÒÑß" + 3238 "Ïîëå" + 3239 "Çíà÷åíèå" + 3240 " Ïðåäïî÷òåíèÿ ïî óìîë÷àíèþ" + 3241 " Ïðåäïî÷òåíèÿ ïîäêëþ÷åíèÿ" + 6144 "ßïîíèÿ" + 6145 "Àëáàíèÿ" + 6146 "Àëæèð" + 6147 "Àìåðèêàíñêèå Ñàìîà" + 6148 "Ãåðìàíèÿ (êîä ñòðàíû èëè ðåãèîíà 04)" + 6149 "Àíãèëüÿ" + 6150 "Àíòèãóà è Áàðáóäà" + 6151 "Àðãåíòèíà" + 6152 "î. Âîçíåñåíèÿ" + 6153 "Àâñòðàëèÿ" + 6154 "Àâñòðèÿ" + 6155 "Áàãàìû" + 6156 "Áàõðåéí" + 6157 "Áàíãëàäåø" + 6158 "Áàðáàäîñ" + 6159 "Áåëüãèÿ" + 6160 "Áåëèç" + 6161 "Áåíèí" + 6162 "Áåðìóäñêèå î-âà" + 6163 "Áóòàí" + 6164 "Áîëèâèÿ" + 6165 "Áîòñâàíà" + 6166 "Áðàçèëèÿ" + 6167 "Êîä ñòðàíû èëè ðåãèîíà (23)" + 6168 "Áðèòàíñêàÿ òåððèòîðèÿ Èíäèéñêîãî îêåàíà" + 6169 "Áðèòàíñêèå Âèðãèíñêèå î-âà" + 6170 "Áðóíåé" + 6171 "Áîëãàðèÿ" + 6172 "Ìüÿíìà" + 6173 "Áóðóíäè" + 6174 "Áåëàðóñü" + 6175 "Êàìåðóí" + 6176 "Êàíàäà" + 6177 "î-âà Çåëåíîãî Ìûñà" + 6178 "Êàéìàíîâû î-âà" + 6179 "Öåíòðàëüíî-Àôðèêàíñêàÿ Ðåñïóáëèêà" + 6180 "×àä" + 6181 "×èëè" + 6182 "Êèòàé" + 6183 "Êîëóìáèÿ" + 6184 "Êîìîðñêèå î-âà" + 6185 "Êîíãî" + 6186 "î-âà Êóêà" + 6187 "Êîñòà-Ðèêà" + 6188 "Êóáà" + 6189 "Êèïð" + 6190 "×åøñêàÿ ðåñïóáëèêà" + 6191 "Êàìáîäæà" + 6192 "Êîðåéñêàÿ íàðîäíî-äåìîêðàòè÷åñêàÿ ðåñïóáëèêà" + 6193 "Äàíèÿ" + 6194 "Äæèáóòè" + 6195 "Äîìèíèêàíñêàÿ Ðåñïóáëèêà" + 6196 "Äîìèíèêà" + 6197 "Ýêâàäîð" + 6198 "Åãèïåò" + 6199 "Ñàëüâàäîð" + 6200 "Ýêâàòîðèàëüíàÿ Ãâèíåÿ" + 6201 "Ýôèîïèÿ" + 6202 "Ôîëêëåíäñêèå (Ìàëüâèíñêèå) î-âà" + 6203 "î-âà Ôèäæè" + 6204 "Ôèíëÿíäèÿ" + 6205 "Ôðàíöèÿ" + 6206 "Ôðàíöóçñêàÿ Ïîëèíåçèÿ" + 6207 "Êîä ñòðàíû èëè ðåãèîíà (63)" + 6208 "Ãàáîí" + 6209 "Ãàìáèÿ" + 6210 "Ãåðìàíèÿ èëè ðåãèîíà (êîä ñòðàíû 66)" + 6211 "Àíãîëà" + 6212 "Ãàíà" + 6213 "Ãèáðàëòàð" + 6214 "Ãðåöèÿ" + 6215 "Ãðåíàäà" + 6216 "î. Ãóàì" + 6217 "Ãâàòåìàëà" + 6218 "Ãåðíñè" + 6219 "Ãâèíåÿ" + 6220 "Ãâèíåÿ-Áèñàó" + 6221 "Ãàéàíà" + 6222 "Ãàèòè" + 6223 "Ãîíäóðàñ" + 6224 "Ãîíêîíã (SAR) " + 6225 "Âåíãðèÿ" + 6226 "Èñëàíäèÿ" + 6227 "Èíäèÿ" + 6228 "Èíäîíåçèÿ" + 6229 "Èðàí" + 6230 "Èðàê" + 6231 "Èðëàíäèÿ" + 6232 "Èçðàèëü" + 6233 "Èòàëèÿ" + 6234 "Êîò ä'Èâóàð (Áåðåã Ñëîíîâîé Êîñòè)" + 6235 "ßìàéêà" + 6236 "Àôãàíèñòàí" + 6237 "Äæåðñè" + 6238 "Èîðäàíèÿ" + 6239 "Êåíèÿ" + 6240 "Êèðèáàòè" + 6241 "Þæíàÿ Êîðåÿ" + 6242 "Êóâåéò" + 6243 "Ëàîñ" + 6244 "Ëèâàí" + 6245 "Ëåñîòî" + 6246 "Ëèáåðèÿ" + 6247 "Ëèâèÿ" + 6248 "Ëèõòåíøòåéí" + 6249 "Ëþêñåìáóðã" + 6250 "Ìàêàî" + 6251 "Ìàäàãàñêàð" + 6252 "Ìàëàéçèÿ" + 6253 "Ìàëàâè" + 6254 "Ìàëüäèâñêèå î-âà" + 6255 "Ìàëè" + 6256 "Ìàëüòà" + 6257 "Ìàâðèòàíèÿ" + 6258 "Ìàâðèêèé" + 6259 "Ìåêñèêà" + 6260 "Ìîíàêî" + 6261 "Ìîíãîëèÿ" + 6262 "Ìîíñåððàò" + 6263 "Ìàðîêêî" + 6264 "Ìîçàìáèê" + 6265 "Íàóðó" + 6266 "Íåïàë" + 6267 "Íèäåðëàíäû" + 6268 "Íèäåðëàíäñêèå Àíòèëüñêèå î-âà" + 6269 "Íîâàÿ Êàëåäîíèÿ" + 6270 "Íîâàÿ Çåëàíäèÿ" + 6271 "Íèêàðàãóà" + 6272 "Íèãåð" + 6273 "Íèãåðèÿ" + 6274 "Íîðâåãèÿ" + 6275 "Îìàí" + 6276 "Ïàêèñòàí" + 6277 "Ïàíàìà" + 6278 "Ïàïóà - Íîâàÿ Ãâèíåÿ" + 6279 "Ïàðàãâàé" + 6280 "Ïåðó" + 6281 "Ôèëèïïèíû" + 6282 "Ïîëüøà" + 6283 "Ïîðòóãàëèÿ" + 6284 "Ïóýðòî-Ðèêî" + 6285 "Êàòàð" + 6286 "Ðóìûíèÿ" + 6287 "Ðóàíäà" + 6288 "Ñåíò-Êèòñ è Íåâèñ" + 6289 "Êîä ñòðàíû èëè ðåãèîíà (145)" + 6290 "î. Ñâÿòîé Åëåíû" + 6291 "Ñàíòà-Ëóñèÿ" + 6292 "Ñàí-Ìàðèíî" + 6293 "Êîä ñòðàíû èëè ðåãèîíà (148)" + 6294 "Ñàí-Òîìå è Ïðèíñèïè" + 6295 "Ñåí-Âèíñåíò è Ãðåíàäèíû" + 6296 "Ñàóäîâñêàÿ Àðàâèÿ" + 6297 "Ñåíåãàë" + 6298 "Ñåéøåëüñêèå î-âà" + 6299 "Ñüåððà-Ëåîíå" + 6300 "Ñèíãàïóð" + 6301 "Ñîëîìîíîâû î-âà" + 6302 "Ñîìàëè" + 6303 "Þæíàÿ Àôðèêà" + 6304 "Èñïàíèÿ" + 6305 "Øðè-Ëàíêà" + 6306 "Ñóäàí" + 6307 "Ñóðèíàì" + 6308 "Ñâàçèëåíä" + 6309 "Øâåöèÿ" + 6310 "Øâåéöàðèÿ" + 6311 "Ñèðèÿ" + 6312 "Òàíçàíèÿ" + 6313 "Òàèëàíä" + 6314 "Òîãî" + 6315 "Òîíãà" + 6316 "Òðèíèäàä è Òîáàãî" + 6317 "Òóíèñ" + 6318 "Òóðöèÿ" + 6319 "î-âà Òóðêñ è Êàéêîñ" + 6320 "Òóâàëó" + 6321 "Óãàíäà" + 6322 "Óêðàèíà" + 6323 "Îáúåäèíåííûå Àðàáñêèå Ýìèðàòû" + 6324 "Âåëèêîáðèòàíèÿ" + 6325 "ÑØÀ" + 6326 "Áóðêèíà-Ôàñî" + 6327 "Óðóãâàé" + 6328 "Êîä ñòðàíû èëè ðåãèîíà (184)" + 6329 "Âàíóàòó" + 6330 "Âàòèêàí" + 6331 "Âåíåñóýëà" + 6332 "Âüåòíàì" + 6333 "Óîëëèñ è Ôóòóíà" + 6334 "Ñàìîà" + 6335 "Éåìåí" + 6336 "Éåìåí" + 6337 "Êîä ñòðàíû èëè ðåãèîíà (193)" + 6338 "Äåìîêðàòè÷åñêàÿ Ðåñïóáëèêà Êîíãî" + 6339 "Çàìáèÿ" + 6340 "Çèìáàáâå" + 6501 "Ìîëäîâà" + 6502 "Ýñòîíèÿ" + 6503 "Ëèòâà" + 6504 "Àðìåíèÿ" + 6505 "Ãðóçèÿ" + 6506 "Àçåðáàéäæàí" + 6507 "Òóðêìåíèñòàí" + 6508 "Óçáåêèñòàí" + 6509 "Êàçàõñòàí" + 6510 "Òàäæèêèñòàí" + 6511 "Êèðãèçñòàí" + 6512 "Ëàòâèÿ" + 6513 "Ðîññèÿ" + 6600 "Õîðâàòèÿ" + 6601 "Ñëîâåíèÿ" + 6602 "Ìàêåäîíèÿ" + 6603 "Áîñíèÿ è Ãåðöåãîâèíà" + 6604 "Þãîñëàâèÿ" + 20013 "ID îáîðóäîâàíèÿ" +END Propchange: trunk/reactos/dll/win32/modemui/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/modemui/modemui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/modemui.… ============================================================================== --- trunk/reactos/dll/win32/modemui/modemui.rc (original) +++ trunk/reactos/dll/win32/modemui/modemui.rc Mon Jan 7 18:08:18 2008 @@ -20,3 +20,4 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/uk-UA.rc" +#include "lang/ru-RU.rc"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs