Ros-diffs April 2020

ros-diffs@reactos.org

45 participants
395 discussions

[reactos] 01/01: [MSPAINT] fr-FR Translate some menu items CORE-12357
by Joachim Henze 13 Apr '20

13 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0503788351f8feb98e0c… commit a0503788351f8feb98e0c6e99cf7d52530a69dc0 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Apr 13 23:27:52 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Apr 13 23:28:30 2020 +0200 [MSPAINT] fr-FR Translate some menu items CORE-12357 --- base/applications/mspaint/lang/fr-FR.rc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 58545edc433..a3c5a3b0661 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -9,19 +9,19 @@ BEGIN MENUITEM "&Enregistrer\tCtrl+S", IDM_FILESAVE MENUITEM "Enregistrer &sous...", IDM_FILESAVEAS MENUITEM SEPARATOR - MENUITEM "From Scanner or Camera...", IDM_FILEFROMSCANNERORCAMERA + MENUITEM "À partir d'un scanneur ou d'une caméra...", IDM_FILEFROMSCANNERORCAMERA MENUITEM SEPARATOR - MENUITEM "Page View", IDM_FILEPAGEVIEW - MENUITEM "Page Setup...", IDM_FILEPAGESETUP + MENUITEM "Aperçu avant impression", IDM_FILEPAGEVIEW + MENUITEM "Mise en page...", IDM_FILEPAGESETUP MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR - MENUITEM "Send...", IDM_FILESEND + MENUITEM "Envoyer...", IDM_FILESEND MENUITEM SEPARATOR MENUITEM "Choisir comme image d'arrière-plan (mosaïque)", IDM_FILEASWALLPAPERPLANE MENUITEM "Choisir comme image d'arrière-plan (centrée)", IDM_FILEASWALLPAPERCENTERED MENUITEM "Choisir comme image d'arrière-plan (étirée)", IDM_FILEASWALLPAPERSTRETCHED MENUITEM SEPARATOR - MENUITEM "Most recently used file", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED + MENUITEM "Fichiers récents", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED MENUITEM SEPARATOR MENUITEM "&Quitter\tAlt+F4", IDM_FILEEXIT END @@ -79,8 +79,8 @@ BEGIN BEGIN MENUITEM "Modifier les couleurs...", IDM_COLORSEDITPALETTE MENUITEM SEPARATOR - MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE - MENUITEM "Old palette", IDM_COLORSOLDPALETTE + MENUITEM "Palette moderne", IDM_COLORSMODERNPALETTE + MENUITEM "Palette ancienne", IDM_COLORSOLDPALETTE END POPUP "&Aide" BEGIN

1 0

[reactos] 01/01: [MSCTF_WINETEST] Skip crashing test when it fails CORE-16797
by Mark Jansen 13 Apr '20

13 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=365fafc03b425f44a940f… commit 365fafc03b425f44a940f1d9e7520a57f6560ae9 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Apr 13 22:44:56 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Apr 13 22:44:56 2020 +0200 [MSCTF_WINETEST] Skip crashing test when it fails CORE-16797 --- modules/rostests/winetests/msctf/inputprocessor.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/rostests/winetests/msctf/inputprocessor.c b/modules/rostests/winetests/msctf/inputprocessor.c index 1222085fe0a..787dba77833 100644 --- a/modules/rostests/winetests/msctf/inputprocessor.c +++ b/modules/rostests/winetests/msctf/inputprocessor.c @@ -2523,6 +2523,12 @@ static DWORD WINAPI test_MultiThreadApartment_Thread(void *param) { hr = CoCreateInstance(&CLSID_TF_ThreadMgr, NULL, CLSCTX_INPROC_SERVER, &IID_ITfThreadMgrEx, (LPVOID *)&thmgr); ok(SUCCEEDED(hr), "Failed to create ITfThreadMgrEx instance\n"); +#ifdef __REACTOS__ + // See CORE-16797 + if (!SUCCEEDED(hr)) + goto err_out; +#endif + hr = ITfThreadMgrEx_QueryInterface(thmgr, &IID_ITfSource, (LPVOID *)&source); ok(SUCCEEDED(hr), "Failed to query ITfSource interface\n"); @@ -2535,6 +2541,9 @@ static DWORD WINAPI test_MultiThreadApartment_Thread(void *param) { hr = ITfThreadMgrEx_Release(thmgr); ok(SUCCEEDED(hr), "Failed to Release thread manager\n"); +#ifdef __REACTOS__ +err_out: +#endif CoUninitialize();

1 0

[reactos] 01/01: [DXDIAG] Less text truncation for all languages
by Joachim Henze 13 Apr '20

13 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dcc6dcb0bd6cb076fabe6… commit dcc6dcb0bd6cb076fabe6fe0a45f9556eed1b379 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Apr 13 22:43:37 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Apr 13 22:43:37 2020 +0200 [DXDIAG] Less text truncation for all languages Manually Tweaked fr-FR the most, see CORE-12477 Manually Tweaked de-DE enlarged a buttons size For All Languages harmonized " :"->":" For All Languages harmonized the maximized available space for dynamic strings in 2nd tab right side from 100->120 --- base/applications/dxdiag/lang/bg-BG.rc | 14 ++--- base/applications/dxdiag/lang/cs-CZ.rc | 14 ++--- base/applications/dxdiag/lang/de-DE.rc | 16 +++--- base/applications/dxdiag/lang/en-US.rc | 14 ++--- base/applications/dxdiag/lang/es-ES.rc | 14 ++--- base/applications/dxdiag/lang/fr-FR.rc | 94 +++++++++++++++++----------------- base/applications/dxdiag/lang/he-IL.rc | 14 ++--- base/applications/dxdiag/lang/it-IT.rc | 16 +++--- base/applications/dxdiag/lang/ja-JP.rc | 14 ++--- base/applications/dxdiag/lang/ko-KR.rc | 14 ++--- base/applications/dxdiag/lang/nl-NL.rc | 14 ++--- base/applications/dxdiag/lang/no-NO.rc | 14 ++--- base/applications/dxdiag/lang/pl-PL.rc | 14 ++--- base/applications/dxdiag/lang/pt-BR.rc | 14 ++--- base/applications/dxdiag/lang/ro-RO.rc | 14 ++--- base/applications/dxdiag/lang/ru-RU.rc | 14 ++--- base/applications/dxdiag/lang/sk-SK.rc | 14 ++--- base/applications/dxdiag/lang/sq-AL.rc | 14 ++--- base/applications/dxdiag/lang/sv-SE.rc | 14 ++--- base/applications/dxdiag/lang/tr-TR.rc | 14 ++--- base/applications/dxdiag/lang/uk-UA.rc | 14 ++--- base/applications/dxdiag/lang/zh-CN.rc | 14 ++--- base/applications/dxdiag/lang/zh-TW.rc | 14 ++--- 23 files changed, 203 insertions(+), 203 deletions(-) diff --git a/base/applications/dxdiag/lang/bg-BG.rc b/base/applications/dxdiag/lang/bg-BG.rc index 5d93fde0250..f1a84256cd2 100644 --- a/base/applications/dxdiag/lang/bg-BG.rc +++ b/base/applications/dxdiag/lang/bg-BG.rc @@ -72,13 +72,13 @@ BEGIN RTEXT "Мини-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "Версия на DDI:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Възможности на РеактХ", IDC_STATIC, 5, 97, 452, 70 RTEXT "Ускорение на DirectDraw:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Ускорение на Direct3D:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/cs-CZ.rc b/base/applications/dxdiag/lang/cs-CZ.rc index 082484e8ff0..0916e77f0c2 100644 --- a/base/applications/dxdiag/lang/cs-CZ.rc +++ b/base/applications/dxdiag/lang/cs-CZ.rc @@ -77,13 +77,13 @@ BEGIN RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "Verze DDI:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Vlastnosti ReactX", IDC_STATIC, 5, 97, 452, 70 RTEXT "DirectDraw akcelerace:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Direct3D akcelerace:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/de-DE.rc b/base/applications/dxdiag/lang/de-DE.rc index 769f342fb10..c2f084a9674 100644 --- a/base/applications/dxdiag/lang/de-DE.rc +++ b/base/applications/dxdiag/lang/de-DE.rc @@ -8,7 +8,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 PUSHBUTTON "&Hilfe", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED - DEFPUSHBUTTON "&Nächste Seite", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&Nächste Seite", IDC_BUTTON_NEXT, 252, 260, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Alle &Informationen speichern...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED PUSHBUTTON "&Beenden", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -72,13 +72,13 @@ BEGIN RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "DDI-Version:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ReactX-Funktionen", IDC_STATIC, 5, 97, 452, 70 RTEXT "DirectDraw-Beschleunigung:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Direct3D-Beschleunigung:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/en-US.rc b/base/applications/dxdiag/lang/en-US.rc index da2e54a4c94..44d26591680 100644 --- a/base/applications/dxdiag/lang/en-US.rc +++ b/base/applications/dxdiag/lang/en-US.rc @@ -72,13 +72,13 @@ BEGIN RTEXT "Mini VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "DDI Version:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 RTEXT "DirectDraw Acceleration:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Direct3D Acceleration:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/es-ES.rc b/base/applications/dxdiag/lang/es-ES.rc index 21dad48953b..8411eaa3682 100644 --- a/base/applications/dxdiag/lang/es-ES.rc +++ b/base/applications/dxdiag/lang/es-ES.rc @@ -74,13 +74,13 @@ BEGIN RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT "vvdddVDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "Versión DDI:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Características ReactX", IDC_STATIC, 5, 97, 452, 70 RTEXT "Aceleración DirectDraw:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Aceleración Direct3D:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/fr-FR.rc b/base/applications/dxdiag/lang/fr-FR.rc index 445b53a9163..18f7127facc 100644 --- a/base/applications/dxdiag/lang/fr-FR.rc +++ b/base/applications/dxdiag/lang/fr-FR.rc @@ -8,8 +8,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 PUSHBUTTON "Aide", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED - DEFPUSHBUTTON "Page suiva&nte", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Enregi&strer toutes les informations...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED + DEFPUSHBUTTON "Page suiva&nte", IDC_BUTTON_NEXT, 232, 260, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Enregi&strer toutes les informations...", IDC_BUTTON_SAVE_INFO, 291, 260, 130, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED PUSHBUTTON "Quitt&er", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -20,16 +20,16 @@ BEGIN LTEXT "Cet outil rapporte des informations détaillées à propos des composants ReactX et des drivers installés sur votre système.", IDC_STATIC, 5, 0, 443, 17 LTEXT "Si vous avez connaissance de la section d'où provient le problème, cliquez sur l'onglet approprié. Autrement, vous pouvez utiliser le bouton ""Page suivante"" ci-dessous pour visualiser chaque page.", IDC_STATIC, 5, 15, 443, 25 GROUPBOX "Informations système", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT - LTEXT "Date/heure actuelles :", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT - LTEXT "Nom de l'ordinateur :", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT - LTEXT "Système d'exploitation :", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT - LTEXT "Langue :", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT - LTEXT "Fabricant du système :", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT - LTEXT "Modèle du système :", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT - LTEXT "BIOS :", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT - LTEXT "Processeur :", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT - LTEXT "Mémoire :", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT - LTEXT "Fichier cache :", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT + LTEXT "Date/heure actuelles:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT + LTEXT "Nom de l'ordinateur:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT + LTEXT "Système d'exploitation:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT + LTEXT "Langue:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT + LTEXT "Fabricant du système:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT + LTEXT "Modèle du système:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT + LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT + LTEXT "Processeur:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT + LTEXT "Mémoire:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT + LTEXT "Fichier cache:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT LTEXT "Version de ReactX:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -50,13 +50,13 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Périphérique", IDC_STATIC, 5, 0, 250, 95 - RTEXT "Nom :", IDC_STATIC, 20, 10, 70, 10 - RTEXT "Fabricant :", IDC_STATIC, 20, 20, 70, 10 - RTEXT "Type de puce :", IDC_STATIC, 20, 30, 70, 10 - RTEXT "Type de DAC :", IDC_STATIC, 20, 40, 70, 10 - RTEXT "Mémoire totale approx. :", IDC_STATIC, 20, 50, 70, 10 - RTEXT "Mode d'affichage actuelle:", IDC_STATIC, 20, 60, 70, 10 - RTEXT "Moniteur :", IDC_STATIC, 20, 70, 70, 10 + RTEXT "Nom:", IDC_STATIC, 7, 10, 83, 10 + RTEXT "Fabricant:", IDC_STATIC, 7, 20, 83, 10 + RTEXT "Type de puce:", IDC_STATIC, 7, 30, 83, 10 + RTEXT "Type de DAC:", IDC_STATIC, 7, 40, 83, 10 + RTEXT "Mémoire totale approx.:", IDC_STATIC, 7, 50, 83, 10 + RTEXT "Mode d'affichage actuelle:", IDC_STATIC, 7, 60, 83, 10 + RTEXT "Moniteur:", IDC_STATIC, 7, 70, 83, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -66,23 +66,23 @@ BEGIN EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Pilote", IDC_STATIC, 260, 0, 197, 95 RTEXT "Pilote principal:", IDC_STATIC, 275, 10, 55, 10 - RTEXT "Version :", IDC_STATIC, 275, 20, 55, 10 - RTEXT "Date :", IDC_STATIC, 275, 30, 55, 10 - RTEXT "WHQL-Logo :", IDC_STATIC, 275, 40, 55, 10 - RTEXT "Mini-VDD :", IDC_STATIC, 275, 50, 55, 10 - RTEXT " vvdddVDD :", IDC_STATIC, 275, 60, 55, 10 - RTEXT "Version DDI :", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + RTEXT "Version:", IDC_STATIC, 275, 20, 55, 10 + RTEXT "Date:", IDC_STATIC, 275, 30, 55, 10 + RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10 + RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10 + RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10 + RTEXT "Version DDI:", IDC_STATIC, 275, 70, 55, 10 + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Fonctionnalités ReactX", IDC_STATIC, 5, 97, 452, 70 - RTEXT "Accélération DirectDraw :", IDC_STATIC, 15, 115, 110, 12 - RTEXT "Accélération Direct3D :", IDC_STATIC, 15, 130, 110, 12 - RTEXT "Accélération des textures AGP :", IDC_STATIC, 15, 145, 110, 12 + RTEXT "Accélération DirectDraw:", IDC_STATIC, 15, 115, 110, 12 + RTEXT "Accélération Direct3D:", IDC_STATIC, 15, 130, 110, 12 + RTEXT "Accélération des textures AGP:", IDC_STATIC, 15, 145, 110, 12 LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10 LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10 LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10 @@ -100,12 +100,12 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Périphérique", IDC_STATIC, 5, 0, 250, 95 - RTEXT "Nom :", IDC_STATIC, 20, 10, 70, 10 - RTEXT "ID périphérique :", IDC_STATIC, 20, 20, 70, 10 - RTEXT "ID fabricant :", IDC_STATIC, 20, 30, 70, 10 + RTEXT "Nom:", IDC_STATIC, 20, 10, 70, 10 + RTEXT "ID périphérique:", IDC_STATIC, 20, 20, 70, 10 + RTEXT "ID fabricant:", IDC_STATIC, 20, 30, 70, 10 RTEXT "ID produit:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "Type :", IDC_STATIC, 20, 50, 70, 10 - RTEXT "Périphérique par défaut :", IDC_STATIC, 20, 60, 70, 10 + RTEXT "Type:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "Périphérique par défaut:", IDC_STATIC, 20, 60, 70, 10 EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -113,12 +113,12 @@ BEGIN EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Pilote", IDC_STATIC, 260, 0, 197, 95 - RTEXT "Nom :", IDC_STATIC, 275, 10, 55, 10 - RTEXT "Version :", IDC_STATIC, 275, 20, 55, 10 - RTEXT "Date :", IDC_STATIC, 275, 30, 55, 10 - RTEXT "WHQL-Logo :", IDC_STATIC, 275, 40, 55, 10 - RTEXT "Autres fichiers :", IDC_STATIC, 275, 50, 55, 10 - RTEXT "Fournisseur :", IDC_STATIC, 275, 60, 55, 10 + RTEXT "Nom:", IDC_STATIC, 275, 10, 55, 10 + RTEXT "Version:", IDC_STATIC, 275, 20, 55, 10 + RTEXT "Date:", IDC_STATIC, 275, 30, 55, 10 + RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10 + RTEXT "Autres fichiers:", IDC_STATIC, 275, 50, 55, 10 + RTEXT "Fournisseur:", IDC_STATIC, 275, 60, 55, 10 EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -127,7 +127,7 @@ BEGIN EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Fonctionnalités ReactX", IDC_STATIC, 5, 97, 452, 70 CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17 - RTEXT "Son matériel\nNiveau d'accélération :", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED + RTEXT "Son matériel\nNiveau d'accélération:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED PUSHBUTTON "Tester DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP diff --git a/base/applications/dxdiag/lang/he-IL.rc b/base/applications/dxdiag/lang/he-IL.rc index bab366e5ef1..d876cf125e2 100644 --- a/base/applications/dxdiag/lang/he-IL.rc +++ b/base/applications/dxdiag/lang/he-IL.rc @@ -76,13 +76,13 @@ BEGIN RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "גירסת DD:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "תכונות ReactX", IDC_STATIC, 5, 97, 452, 70 RTEXT "תאוצת DirectDraw:", IDC_STATIC, 15, 115, 110, 12 RTEXT "תאוצת Direct3D:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/it-IT.rc b/base/applications/dxdiag/lang/it-IT.rc index cd1f07867f5..c37c647aa5d 100644 --- a/base/applications/dxdiag/lang/it-IT.rc +++ b/base/applications/dxdiag/lang/it-IT.rc @@ -25,7 +25,7 @@ BEGIN LTEXT "Sistema operativo:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT LTEXT "Lingua:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT LTEXT "Produttore DI sistema:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT - LTEXT "Modello di Sistem :", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT + LTEXT "Modello di Sistem:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT LTEXT "Processore:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT LTEXT "Memoria:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT @@ -72,13 +72,13 @@ BEGIN RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "DDI Version:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ReactX-Features", IDC_STATIC, 5, 97, 452, 70 RTEXT "Accelerazione DirectDraw:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Accelerazione Direct3D:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/ja-JP.rc b/base/applications/dxdiag/lang/ja-JP.rc index 13d9fcbcbf2..f17d2ef9df8 100644 --- a/base/applications/dxdiag/lang/ja-JP.rc +++ b/base/applications/dxdiag/lang/ja-JP.rc @@ -72,13 +72,13 @@ BEGIN RTEXT "Mini VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "DDIのバージョン:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ReactX の機能", IDC_STATIC, 5, 97, 452, 70 RTEXT "DirectDraw アクセラレーション:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Direct3D アクセラレーション:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/ko-KR.rc b/base/applications/dxdiag/lang/ko-KR.rc index f46aca6d8a8..7f6fcd2a7ef 100644 --- a/base/applications/dxdiag/lang/ko-KR.rc +++ b/base/applications/dxdiag/lang/ko-KR.rc @@ -74,13 +74,13 @@ BEGIN RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "DDI 버젼:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ReactX-기능", IDC_STATIC, 5, 97, 452, 70 RTEXT "DirectDraw 가속:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Direct3D 가속:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/nl-NL.rc b/base/applications/dxdiag/lang/nl-NL.rc index 033e5faa8ab..aac48ec27b6 100644 --- a/base/applications/dxdiag/lang/nl-NL.rc +++ b/base/applications/dxdiag/lang/nl-NL.rc @@ -72,13 +72,13 @@ BEGIN RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "DDI-versie:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ReactX-functies", IDC_STATIC, 5, 97, 452, 70 RTEXT "DirectDraw-versnelling:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Direct3D-versnelling:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/no-NO.rc b/base/applications/dxdiag/lang/no-NO.rc index 672e2829b28..4d2f99e5a81 100644 --- a/base/applications/dxdiag/lang/no-NO.rc +++ b/base/applications/dxdiag/lang/no-NO.rc @@ -72,13 +72,13 @@ BEGIN RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "DDI Versjon:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ReactX-Funksjoner", IDC_STATIC, 5, 97, 452, 70 RTEXT "DirectDraw akselerasjon:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Direct3D akselerasjon:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/pl-PL.rc b/base/applications/dxdiag/lang/pl-PL.rc index 06130881db9..78cba2c2b49 100644 --- a/base/applications/dxdiag/lang/pl-PL.rc +++ b/base/applications/dxdiag/lang/pl-PL.rc @@ -81,13 +81,13 @@ BEGIN RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "Wersja DDI:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ReactX", IDC_STATIC, 5, 97, 452, 70 RTEXT "DirectDraw:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Direct3D:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/pt-BR.rc b/base/applications/dxdiag/lang/pt-BR.rc index dae11384358..61dc00e61c1 100644 --- a/base/applications/dxdiag/lang/pt-BR.rc +++ b/base/applications/dxdiag/lang/pt-BR.rc @@ -74,13 +74,13 @@ BEGIN RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "Versão do DDI:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 RTEXT "Aceleração do DirectDraw:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Aceleração do Direct3D:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/ro-RO.rc b/base/applications/dxdiag/lang/ro-RO.rc index 9e510ce08af..6ef4613155d 100644 --- a/base/applications/dxdiag/lang/ro-RO.rc +++ b/base/applications/dxdiag/lang/ro-RO.rc @@ -78,13 +78,13 @@ BEGIN RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "Versiune DDI:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Funcționalități ReactX", IDC_STATIC, 5, 97, 452, 70 RTEXT "Accelerare DirectDraw:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Accelerare Direct3D:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/ru-RU.rc b/base/applications/dxdiag/lang/ru-RU.rc index 02bcd3e103c..4998b80bcb0 100644 --- a/base/applications/dxdiag/lang/ru-RU.rc +++ b/base/applications/dxdiag/lang/ru-RU.rc @@ -72,13 +72,13 @@ BEGIN RTEXT "Мини-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "Версия DDI:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Возможности ReactX", IDC_STATIC, 5, 97, 452, 70 RTEXT "Ускорение DirectDraw:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Ускорение Direct3D:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/sk-SK.rc b/base/applications/dxdiag/lang/sk-SK.rc index 44a917db138..3aff7738377 100644 --- a/base/applications/dxdiag/lang/sk-SK.rc +++ b/base/applications/dxdiag/lang/sk-SK.rc @@ -77,13 +77,13 @@ BEGIN RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "Verzia DDI:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ReactX - funkcie", IDC_STATIC, 5, 97, 452, 70 RTEXT "DirectDraw urýchľovanie:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Direct3D urýchľovanie:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/sq-AL.rc b/base/applications/dxdiag/lang/sq-AL.rc index 7773a7cabfe..6e738efeff6 100644 --- a/base/applications/dxdiag/lang/sq-AL.rc +++ b/base/applications/dxdiag/lang/sq-AL.rc @@ -76,13 +76,13 @@ BEGIN RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "DDI Versioni:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 RTEXT "Përshpejtimi i DirectDraw:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Përshpejtimi i Direct3D:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/sv-SE.rc b/base/applications/dxdiag/lang/sv-SE.rc index 321facb1e0d..9829ecf5fbb 100644 --- a/base/applications/dxdiag/lang/sv-SE.rc +++ b/base/applications/dxdiag/lang/sv-SE.rc @@ -79,13 +79,13 @@ BEGIN RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "DDI Version:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ReactX-Funktioner", IDC_STATIC, 5, 97, 452, 70 RTEXT "DirectDraw-accelerasjon:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Direct3D-accelerasjon:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/tr-TR.rc b/base/applications/dxdiag/lang/tr-TR.rc index b0585e4e6ab..74a6aee51b6 100644 --- a/base/applications/dxdiag/lang/tr-TR.rc +++ b/base/applications/dxdiag/lang/tr-TR.rc @@ -74,13 +74,13 @@ BEGIN RTEXT "Mini VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "DDI Sürümü:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ReactX Husûsiyetleri", IDC_STATIC, 5, 97, 452, 70 RTEXT "ReactDraw İvmesi:", IDC_STATIC, 15, 115, 110, 12 RTEXT "React3D İvmesi:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/uk-UA.rc b/base/applications/dxdiag/lang/uk-UA.rc index 971094a14cc..8c1b15c0b45 100644 --- a/base/applications/dxdiag/lang/uk-UA.rc +++ b/base/applications/dxdiag/lang/uk-UA.rc @@ -80,13 +80,13 @@ BEGIN RTEXT "Міні-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "Версія DDI:", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Можливості ReactX", IDC_STATIC, 5, 97, 452, 70 RTEXT "Прискорення DirectDraw:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Прискорення Direct3D:", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/zh-CN.rc b/base/applications/dxdiag/lang/zh-CN.rc index 41293317cd4..4579a868f9b 100644 --- a/base/applications/dxdiag/lang/zh-CN.rc +++ b/base/applications/dxdiag/lang/zh-CN.rc @@ -81,13 +81,13 @@ BEGIN RTEXT "迷你 VDD：", IDC_STATIC, 275, 50, 55, 10 RTEXT "VDD：", IDC_STATIC, 275, 60, 55, 10 RTEXT "DDI 版本：", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ReactX 功能", IDC_STATIC, 5, 97, 452, 70 RTEXT "DirectDraw 加速：", IDC_STATIC, 15, 115, 110, 12 RTEXT "Direct3D 加速：", IDC_STATIC, 15, 130, 110, 12 diff --git a/base/applications/dxdiag/lang/zh-TW.rc b/base/applications/dxdiag/lang/zh-TW.rc index be00d93965f..93d9926ad29 100644 --- a/base/applications/dxdiag/lang/zh-TW.rc +++ b/base/applications/dxdiag/lang/zh-TW.rc @@ -80,13 +80,13 @@ BEGIN RTEXT "迷你 VDD：", IDC_STATIC, 275, 50, 55, 10 RTEXT "VDD：", IDC_STATIC, 275, 60, 55, 10 RTEXT "DDI 版本：", IDC_STATIC, 275, 70, 55, 10 - EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "ReactX 功能", IDC_STATIC, 5, 97, 452, 70 RTEXT "DirectDraw 加速：", IDC_STATIC, 15, 115, 110, 12 RTEXT "Direct3D 加速：", IDC_STATIC, 15, 130, 110, 12

1 0

[reactos] 01/01: [WINDOWSCODECS] Avoid buffer underflow in TiffFrameDecode_ReadTile. CORE-16796
by Thomas Faber 13 Apr '20

13 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4a8d3d70483c7d781e1e… commit f4a8d3d70483c7d781e1e674a633a449e52197e8 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Apr 13 17:55:00 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Apr 13 18:18:35 2020 +0200 [WINDOWSCODECS] Avoid buffer underflow in TiffFrameDecode_ReadTile. CORE-16796 --- dll/win32/windowscodecs/tiffformat.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dll/win32/windowscodecs/tiffformat.c b/dll/win32/windowscodecs/tiffformat.c index 6f4f6d06b74..e7141fc3e23 100644 --- a/dll/win32/windowscodecs/tiffformat.c +++ b/dll/win32/windowscodecs/tiffformat.c @@ -1164,6 +1164,21 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT { BYTE b = *src--; +#ifdef __REACTOS__ + dst -= 4; + dst[2] = (b & 0x08) ? 0xff : 0; /* R */ + dst[1] = (b & 0x04) ? 0xff : 0; /* G */ + dst[0] = (b & 0x02) ? 0xff : 0; /* B */ + dst[3] = (b & 0x01) ? 0xff : 0; /* A */ + if (count || This->decode_info.tile_width % 2 == 0) + { + dst -= 4; + dst[2] = (b & 0x80) ? 0xff : 0; /* R */ + dst[1] = (b & 0x40) ? 0xff : 0; /* G */ + dst[0] = (b & 0x20) ? 0xff : 0; /* B */ + dst[3] = (b & 0x10) ? 0xff : 0; /* A */ + } +#else dst -= 8; dst[2] = (b & 0x80) ? 0xff : 0; /* R */ dst[1] = (b & 0x40) ? 0xff : 0; /* G */ @@ -1173,6 +1188,7 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT dst[5] = (b & 0x04) ? 0xff : 0; /* G */ dst[4] = (b & 0x02) ? 0xff : 0; /* B */ dst[7] = (b & 0x01) ? 0xff : 0; /* A */ +#endif } } /* 16bpp RGBA */

1 0

[reactos] 01/01: Fix build.
by Hermès Bélusca-Maïto 13 Apr '20

13 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b64d4537732fa727c24d… commit 2b64d4537732fa727c24d5f060bcf606a319ebbc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Apr 13 18:10:54 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Apr 13 18:13:42 2020 +0200 Fix build. --- win32ss/user/winsrv/consrv/consrv.h | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/user/winsrv/consrv/consrv.h b/win32ss/user/winsrv/consrv/consrv.h index 5d9353faa32..5700b9b6548 100644 --- a/win32ss/user/winsrv/consrv/consrv.h +++ b/win32ss/user/winsrv/consrv/consrv.h @@ -62,6 +62,7 @@ typedef struct _CONSOLE_PROCESS_DATA #include "include/settings.h" #include "include/term.h" #include "console.h" +#include "coninput.h" #include "conoutput.h" #include "handle.h" #include "lineinput.h"

1 0

[reactos] 01/01: [CONSRV] Convenience fixes.
by Hermès Bélusca-Maïto 13 Apr '20

13 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83c238e4902c064cfbb82… commit 83c238e4902c064cfbb823d63da153f0651e363f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 12 19:03:30 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Apr 13 16:22:53 2020 +0200 [CONSRV] Convenience fixes. - Simplify screen-buffers initialization. - Get rid of this CONSOLE_SCREEN_BUFFER_VTBL virtual table. - Move ConsoleInput to a proper header. --- win32ss/user/winsrv/consrv/condrv/conoutput.c | 51 +++++++++++++++------------ win32ss/user/winsrv/consrv/condrv/graphics.c | 26 ++++---------- win32ss/user/winsrv/consrv/condrv/text.c | 27 ++++---------- win32ss/user/winsrv/consrv/coninput.h | 7 ++++ win32ss/user/winsrv/consrv/consrv.h | 6 ---- win32ss/user/winsrv/consrv/include/conio.h | 19 +++------- 6 files changed, 55 insertions(+), 81 deletions(-) diff --git a/win32ss/user/winsrv/consrv/condrv/conoutput.c b/win32ss/user/winsrv/consrv/condrv/conoutput.c index bec9903f814..0870ab6d521 100644 --- a/win32ss/user/winsrv/consrv/condrv/conoutput.c +++ b/win32ss/user/winsrv/consrv/condrv/conoutput.c @@ -34,10 +34,11 @@ GRAPHICS_BUFFER_Destroy(IN OUT PCONSOLE_SCREEN_BUFFER Buffer); NTSTATUS -CONSOLE_SCREEN_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, - IN PCONSOLE Console, - IN PCONSOLE_SCREEN_BUFFER_VTBL Vtbl, - IN SIZE_T Size) +CONSOLE_SCREEN_BUFFER_Initialize( + OUT PCONSOLE_SCREEN_BUFFER* Buffer, + IN PCONSOLE Console, + IN CONSOLE_IO_OBJECT_TYPE Type, + IN SIZE_T Size) { if (Buffer == NULL || Console == NULL) return STATUS_INVALID_PARAMETER; @@ -46,32 +47,37 @@ CONSOLE_SCREEN_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, if (*Buffer == NULL) return STATUS_INSUFFICIENT_RESOURCES; /* Initialize the header with the default type */ - ConSrvInitObject(&(*Buffer)->Header, SCREEN_BUFFER, Console); - (*Buffer)->Vtbl = Vtbl; + ConSrvInitObject(&(*Buffer)->Header, Type /* SCREEN_BUFFER */, Console); return STATUS_SUCCESS; } VOID CONSOLE_SCREEN_BUFFER_Destroy(IN OUT PCONSOLE_SCREEN_BUFFER Buffer) { - if (Buffer->Header.Type == TEXTMODE_BUFFER) + switch (Buffer->Header.Type) { + case TEXTMODE_BUFFER: TEXTMODE_BUFFER_Destroy(Buffer); - } - else if (Buffer->Header.Type == GRAPHICS_BUFFER) - { + break; + + case GRAPHICS_BUFFER: GRAPHICS_BUFFER_Destroy(Buffer); - } - else if (Buffer->Header.Type == SCREEN_BUFFER) + break; + + case SCREEN_BUFFER: { /* Free the palette handle */ - if (Buffer->PaletteHandle != NULL) DeleteObject(Buffer->PaletteHandle); + if (Buffer->PaletteHandle != NULL) + DeleteObject(Buffer->PaletteHandle); /* Free the screen buffer memory */ ConsoleFreeHeap(Buffer); + break; + } + + default: + break; } - // else - // do_nothing; } // ConDrvCreateConsoleScreenBuffer @@ -94,18 +100,19 @@ ConDrvCreateScreenBuffer(OUT PCONSOLE_SCREEN_BUFFER* Buffer, if (ProcessHandle == NULL) ProcessHandle = NtCurrentProcess(); - if (BufferType == CONSOLE_TEXTMODE_BUFFER) + switch (BufferType) { + case CONSOLE_TEXTMODE_BUFFER: Status = TEXTMODE_BUFFER_Initialize(Buffer, Console, ProcessHandle, (PTEXTMODE_BUFFER_INFO)ScreenBufferInfo); - } - else if (BufferType == CONSOLE_GRAPHICS_BUFFER) - { + break; + + case CONSOLE_GRAPHICS_BUFFER: Status = GRAPHICS_BUFFER_Initialize(Buffer, Console, ProcessHandle, (PGRAPHICS_BUFFER_INFO)ScreenBufferInfo); - } - else - { + break; + + default: /* Never ever go there!! */ ASSERT(FALSE); } diff --git a/win32ss/user/winsrv/consrv/condrv/graphics.c b/win32ss/user/winsrv/consrv/condrv/graphics.c index 694c2f52106..3e65ee36d82 100644 --- a/win32ss/user/winsrv/consrv/condrv/graphics.c +++ b/win32ss/user/winsrv/consrv/condrv/graphics.c @@ -18,24 +18,13 @@ /* PRIVATE FUNCTIONS **********************************************************/ -CONSOLE_IO_OBJECT_TYPE -GRAPHICS_BUFFER_GetType(PCONSOLE_SCREEN_BUFFER This) -{ - // return This->Header.Type; - return GRAPHICS_BUFFER; -} - -static CONSOLE_SCREEN_BUFFER_VTBL GraphicsVtbl = -{ - GRAPHICS_BUFFER_GetType, -}; - - NTSTATUS -CONSOLE_SCREEN_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, - IN PCONSOLE Console, - IN PCONSOLE_SCREEN_BUFFER_VTBL Vtbl, - IN SIZE_T Size); +CONSOLE_SCREEN_BUFFER_Initialize( + OUT PCONSOLE_SCREEN_BUFFER* Buffer, + IN PCONSOLE Console, + IN CONSOLE_IO_OBJECT_TYPE Type, + IN SIZE_T Size); + VOID CONSOLE_SCREEN_BUFFER_Destroy(IN OUT PCONSOLE_SCREEN_BUFFER Buffer); @@ -59,10 +48,9 @@ GRAPHICS_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, Status = CONSOLE_SCREEN_BUFFER_Initialize((PCONSOLE_SCREEN_BUFFER*)&NewBuffer, Console, - &GraphicsVtbl, + GRAPHICS_BUFFER, sizeof(GRAPHICS_SCREEN_BUFFER)); if (!NT_SUCCESS(Status)) return Status; - NewBuffer->Header.Type = GRAPHICS_BUFFER; /* * Remember the handle to the process so that we can close or unmap diff --git a/win32ss/user/winsrv/consrv/condrv/text.c b/win32ss/user/winsrv/consrv/condrv/text.c index 2b568652ec2..252d1f0f413 100644 --- a/win32ss/user/winsrv/consrv/condrv/text.c +++ b/win32ss/user/winsrv/consrv/condrv/text.c @@ -36,28 +36,16 @@ do { \ /* PRIVATE FUNCTIONS **********************************************************/ -CONSOLE_IO_OBJECT_TYPE -TEXTMODE_BUFFER_GetType(PCONSOLE_SCREEN_BUFFER This) -{ - // return This->Header.Type; - return TEXTMODE_BUFFER; -} - -static CONSOLE_SCREEN_BUFFER_VTBL TextVtbl = -{ - TEXTMODE_BUFFER_GetType, -}; - - /*static*/ VOID ClearLineBuffer(PTEXTMODE_SCREEN_BUFFER Buff); - NTSTATUS -CONSOLE_SCREEN_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, - IN PCONSOLE Console, - IN PCONSOLE_SCREEN_BUFFER_VTBL Vtbl, - IN SIZE_T Size); +CONSOLE_SCREEN_BUFFER_Initialize( + OUT PCONSOLE_SCREEN_BUFFER* Buffer, + IN PCONSOLE Console, + IN CONSOLE_IO_OBJECT_TYPE Type, + IN SIZE_T Size); + VOID CONSOLE_SCREEN_BUFFER_Destroy(IN OUT PCONSOLE_SCREEN_BUFFER Buffer); @@ -86,10 +74,9 @@ TEXTMODE_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, Status = CONSOLE_SCREEN_BUFFER_Initialize((PCONSOLE_SCREEN_BUFFER*)&NewBuffer, Console, - &TextVtbl, + TEXTMODE_BUFFER, sizeof(TEXTMODE_SCREEN_BUFFER)); if (!NT_SUCCESS(Status)) return Status; - NewBuffer->Header.Type = TEXTMODE_BUFFER; NewBuffer->Buffer = ConsoleAllocHeap(HEAP_ZERO_MEMORY, TextModeInfo->ScreenBufferSize.X * diff --git a/win32ss/user/winsrv/consrv/coninput.h b/win32ss/user/winsrv/consrv/coninput.h index ea186b0fcce..52fca0b990d 100644 --- a/win32ss/user/winsrv/consrv/coninput.h +++ b/win32ss/user/winsrv/consrv/coninput.h @@ -9,6 +9,13 @@ #pragma once +typedef struct ConsoleInput_t +{ + LIST_ENTRY ListEntry; + INPUT_RECORD InputEvent; +} ConsoleInput; + + NTSTATUS NTAPI ConDrvInitInputBuffer(IN PCONSOLE Console, IN ULONG InputBufferSize); diff --git a/win32ss/user/winsrv/consrv/consrv.h b/win32ss/user/winsrv/consrv/consrv.h index 546913ac050..5d9353faa32 100644 --- a/win32ss/user/winsrv/consrv/consrv.h +++ b/win32ss/user/winsrv/consrv/consrv.h @@ -54,12 +54,6 @@ typedef struct _CONSOLE_PROCESS_DATA // LPTHREAD_START_ROUTINE ImeRoutine; } CONSOLE_PROCESS_DATA, *PCONSOLE_PROCESS_DATA; -typedef struct ConsoleInput_t -{ - LIST_ENTRY ListEntry; - INPUT_RECORD InputEvent; -} ConsoleInput; - #include "include/conio.h" #include "include/conio_winsrv.h" diff --git a/win32ss/user/winsrv/consrv/include/conio.h b/win32ss/user/winsrv/consrv/include/conio.h index ca5bf202c56..37360b17b11 100644 --- a/win32ss/user/winsrv/consrv/include/conio.h +++ b/win32ss/user/winsrv/consrv/include/conio.h @@ -51,20 +51,11 @@ typedef struct _CONSOLE_IO_OBJECT * See conoutput.c for the implementation */ -typedef struct _CONSOLE_SCREEN_BUFFER CONSOLE_SCREEN_BUFFER, - *PCONSOLE_SCREEN_BUFFER; +#define GetType(This) (((PCONSOLE_SCREEN_BUFFER)(This))->Header.Type) -typedef struct _CONSOLE_SCREEN_BUFFER_VTBL -{ - CONSOLE_IO_OBJECT_TYPE (*GetType)(PCONSOLE_SCREEN_BUFFER This); -} CONSOLE_SCREEN_BUFFER_VTBL, *PCONSOLE_SCREEN_BUFFER_VTBL; - -#define GetType(This) (This)->Vtbl->GetType(This) - -struct _CONSOLE_SCREEN_BUFFER +typedef struct _CONSOLE_SCREEN_BUFFER { CONSOLE_IO_OBJECT Header; /* Object header - MUST BE IN FIRST PLACE */ - PCONSOLE_SCREEN_BUFFER_VTBL Vtbl; /* Virtual table */ LIST_ENTRY ListEntry; /* Entry in console's list of buffers */ @@ -90,7 +81,7 @@ struct _CONSOLE_SCREEN_BUFFER // USHORT ScreenDefaultAttrib; /* Default screen char attribute */ // USHORT PopupDefaultAttrib; /* Default popup char attribute */ USHORT Mode; /* Output buffer modes */ -}; +} CONSOLE_SCREEN_BUFFER, *PCONSOLE_SCREEN_BUFFER; @@ -182,8 +173,6 @@ typedef struct _CONSOLE_INPUT_BUFFER } CONSOLE_INPUT_BUFFER, *PCONSOLE_INPUT_BUFFER; -typedef struct _TERMINAL TERMINAL, *PTERMINAL; - /* * Structure used to hold console information */ @@ -204,6 +193,8 @@ typedef struct _CONSOLE_INFO } CONSOLE_INFO, *PCONSOLE_INFO; +typedef struct _TERMINAL TERMINAL, *PTERMINAL; + typedef struct _TERMINAL_VTBL { /*

1 0

[reactos] 01/01: [SHELL32] No french translation from "right click drag'n'drop"
by Eric Kohl 13 Apr '20

13 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69e565891d47714a67a73… commit 69e565891d47714a67a736fe7f5e11a3748bc5a6 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Apr 13 15:41:13 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Apr 13 15:41:13 2020 +0200 [SHELL32] No french translation from "right click drag'n'drop" CORE-16815 --- dll/win32/shell32/lang/fr-FR.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 792e6733c3b..6051bda7e76 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -80,11 +80,11 @@ IDM_DRAGFILE MENU BEGIN POPUP "" BEGIN - MENUITEM "&Copy here", IDM_COPYHERE - MENUITEM "&Move here", IDM_MOVEHERE - MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM "&Copier ici", IDM_COPYHERE + MENUITEM "&Déplacer ici", IDM_MOVEHERE + MENUITEM "Créer les &raccourcis ici", IDM_LINKHERE MENUITEM SEPARATOR - MENUITEM "Cancel", 0 + MENUITEM "Annuler", 0 END END

1 0

[reactos] 01/01: [SHELL32] Fix missing french translation for "Command prompt here"
by Eric Kohl 13 Apr '20

13 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c037278c5fdcb5dd8cf6d… commit c037278c5fdcb5dd8cf6d297aa2a09acbcbf6c7a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Apr 13 15:27:47 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Apr 13 15:27:47 2020 +0200 [SHELL32] Fix missing french translation for "Command prompt here" CORE-16855 --- dll/win32/shell32/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 4a212dd08e7..792e6733c3b 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -919,7 +919,7 @@ BEGIN IDS_EDIT_VERB "Éditer" IDS_FIND_VERB "Chercher" IDS_PRINT_VERB "Imprimer" - IDS_CMD_VERB "Command Prompt here" + IDS_CMD_VERB "Ouvrir l'invite de commandes" IDS_FILE_FOLDER "%u fichiers, %u répertoires" IDS_PRINTERS "Imprimantes"

1 0

[reactos] 01/01: [DEVMGR] Do not add the 'Resources' page to the device properties if the device does not have any resources
by Eric Kohl 13 Apr '20

13 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16a4fc76de304184a2942… commit 16a4fc76de304184a2942e99a90936c6abf2d4bb Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Apr 13 12:33:58 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Apr 13 12:33:58 2020 +0200 [DEVMGR] Do not add the 'Resources' page to the device properties if the device does not have any resources --- dll/win32/devmgr/properties/advprop.cpp | 9 ++++- dll/win32/devmgr/properties/hwresource.cpp | 64 +++++++++++++++++++----------- dll/win32/devmgr/properties/properties.h | 5 +++ 3 files changed, 53 insertions(+), 25 deletions(-) diff --git a/dll/win32/devmgr/properties/advprop.cpp b/dll/win32/devmgr/properties/advprop.cpp index 8df086fe4ba..27cd2faad2a 100644 --- a/dll/win32/devmgr/properties/advprop.cpp +++ b/dll/win32/devmgr/properties/advprop.cpp @@ -2517,6 +2517,8 @@ GetParentNode: nDriverPages = 0; } + dap->pResourceList = GetResourceList(dap->szDeviceID); + /* include the driver page */ if (dap->HasDriverPage) dap->nDevPropSheets++; @@ -2525,7 +2527,7 @@ GetParentNode: if (dap->Extended) dap->nDevPropSheets++; - if (dap->HasResourcePage) + if (dap->HasResourcePage && dap->pResourceList != NULL) dap->nDevPropSheets++; /* add the device property sheets */ @@ -2627,7 +2629,7 @@ GetParentNode: } } - if (dap->HasResourcePage) + if (dap->HasResourcePage && dap->pResourceList) { PROPSHEETPAGE pspDriver = {0}; pspDriver.dwSize = sizeof(PROPSHEETPAGE); @@ -3060,6 +3062,9 @@ Cleanup: DestroyIcon(DevAdvPropInfo->hDevIcon); } + if (DevAdvPropInfo->pResourceList != NULL) + HeapFree(GetProcessHeap(), 0, DevAdvPropInfo->pResourceList); + HeapFree(GetProcessHeap(), 0, DevAdvPropInfo); diff --git a/dll/win32/devmgr/properties/hwresource.cpp b/dll/win32/devmgr/properties/hwresource.cpp index 2455544f48c..76879042415 100644 --- a/dll/win32/devmgr/properties/hwresource.cpp +++ b/dll/win32/devmgr/properties/hwresource.cpp @@ -244,34 +244,12 @@ AddResourceItems( IN PDEVADVPROP_INFO dap, IN HWND hWndDevList) { - HKEY hKey; WCHAR szBuffer[100]; WCHAR szDetail[100]; - BYTE szData[512]; - DWORD dwSize; PCM_RESOURCE_LIST ResourceList; - LONG Result; ULONG ItemCount = 0, Index; - wsprintf(szBuffer, L"SYSTEM\\CurrentControlSet\\Enum\\%s\\LogConf", dap->szDeviceID); - Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, KEY_READ, &hKey); - if (Result != ERROR_SUCCESS) - { - /* failed to open device instance log conf dir */ - return; - } - - dwSize = sizeof(szData); - Result = RegQueryValueExW(hKey, L"BootConfig", NULL, NULL, szData, &dwSize); - - RegCloseKey(hKey); - if (Result != ERROR_SUCCESS) - { - /* failed to query resources */ - return; - } - - ResourceList = (PCM_RESOURCE_LIST)szData; + ResourceList = (PCM_RESOURCE_LIST)dap->pResourceList; for (Index = 0; Index < ResourceList->List[0].PartialResourceList.Count; Index++) { @@ -374,3 +352,43 @@ ResourcesProcDriverDlgProc(IN HWND hwndDlg, return Ret; } + +PVOID +GetResourceList( + LPWSTR pszDeviceID) +{ + WCHAR szBuffer[100]; + PCM_RESOURCE_LIST pResourceList = NULL; + HKEY hKey = NULL; + DWORD dwError, dwSize; + + wsprintf(szBuffer, L"SYSTEM\\CurrentControlSet\\Enum\\%s\\LogConf", pszDeviceID); + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, KEY_READ, &hKey); + if (dwError != ERROR_SUCCESS) + { + /* failed to open device instance log conf dir */ + return NULL; + } + + dwSize = 0; + RegQueryValueExW(hKey, L"BootConfig", NULL, NULL, NULL, &dwSize); + if (dwSize == 0) + goto done; + + pResourceList = static_cast<PCM_RESOURCE_LIST>(HeapAlloc(GetProcessHeap(), 0, dwSize)); + if (pResourceList == NULL) + goto done; + + dwError = RegQueryValueExW(hKey, L"BootConfig", NULL, NULL, (LPBYTE)pResourceList, &dwSize); + if (dwError != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, pResourceList); + pResourceList = NULL; + } + +done: + if (hKey != NULL) + RegCloseKey(hKey); + + return (PVOID)pResourceList; +} diff --git a/dll/win32/devmgr/properties/properties.h b/dll/win32/devmgr/properties/properties.h index 9a7f135450b..e664ad0a513 100644 --- a/dll/win32/devmgr/properties/properties.h +++ b/dll/win32/devmgr/properties/properties.h @@ -53,6 +53,7 @@ typedef struct _DEVADVPROP_INFO }; }; + PVOID pResourceList; WCHAR szDevName[255]; WCHAR szTemp[255]; WCHAR szDeviceID[1]; @@ -79,6 +80,10 @@ ResourcesProcDriverDlgProc(IN HWND hwndDlg, IN WPARAM wParam, IN LPARAM lParam); +PVOID +GetResourceList( + _In_ LPWSTR pszDeviceID); + /* ADVPROP.C */ INT_PTR

1 0

[reactos] 01/01: [IPCONFIG] Improvements to ipconfig
by Eric Kohl 13 Apr '20

13 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ca7d5d94889a620e1690… commit 1ca7d5d94889a620e169068030164bf51ee16c35 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Apr 13 11:25:09 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Apr 13 11:25:50 2020 +0200 [IPCONFIG] Improvements to ipconfig - Simplify the cleanup-code in ShowInfo - Print the 'Primary DNS suffix' and the 'DNS Suffix Search List' - Move the /registerdns message into its own function --- base/applications/network/ipconfig/ipconfig.c | 62 +++++++++++++++++++-------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index e6cd2449902..8f3e4b3e5db 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -499,22 +499,37 @@ VOID ShowInfo(BOOL bAll) ULONG netOutBufLen = 0; PIP_PER_ADAPTER_INFO pPerAdapterInfo = NULL; ULONG ulPerAdapterInfoLength = 0; + PSTR pszDomainName = NULL; + DWORD dwDomainNameSize = 0; ULONG ret = 0; + GetComputerNameExA(ComputerNameDnsDomain, + NULL, + &dwDomainNameSize); + if (dwDomainNameSize > 0) + { + pszDomainName = HeapAlloc(ProcessHeap, + 0, + dwDomainNameSize * sizeof(TCHAR)); + if (pszDomainName != NULL) + GetComputerNameExA(ComputerNameDnsDomain, + pszDomainName, + &dwDomainNameSize); + } + /* call GetAdaptersInfo to obtain the adapter info */ ret = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen); if (ret == ERROR_BUFFER_OVERFLOW) { pAdapterInfo = (IP_ADAPTER_INFO *)HeapAlloc(ProcessHeap, 0, adaptOutBufLen); if (pAdapterInfo == NULL) - return; + goto done; ret = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen); if (ret != NO_ERROR) { DoFormatMessage(0); - HeapFree(ProcessHeap, 0, pAdapterInfo); - return; + goto done; } } else @@ -522,7 +537,7 @@ VOID ShowInfo(BOOL bAll) if (ret != ERROR_NO_DATA) { DoFormatMessage(0); - return; + goto done; } } @@ -532,25 +547,18 @@ VOID ShowInfo(BOOL bAll) pFixedInfo = (FIXED_INFO *)HeapAlloc(ProcessHeap, 0, netOutBufLen); if (pFixedInfo == NULL) { - if (pAdapterInfo) - HeapFree(ProcessHeap, 0, pAdapterInfo); - return; + goto done; } if (GetNetworkParams(pFixedInfo, &netOutBufLen) != NO_ERROR) { DoFormatMessage(0); - if (pAdapterInfo) - HeapFree(ProcessHeap, 0, pAdapterInfo); - HeapFree(ProcessHeap, 0, pFixedInfo); - return; + goto done; } } else { - if (pAdapterInfo) - HeapFree(ProcessHeap, 0, pAdapterInfo); DoFormatMessage(0); - return; + goto done; } pAdapter = pAdapterInfo; @@ -559,7 +567,7 @@ VOID ShowInfo(BOOL bAll) if (bAll) { _tprintf(_T("\tHost Name . . . . . . . . . . . . : %s\n"), pFixedInfo->HostName); - _tprintf(_T("\tPrimary DNS Suffix. . . . . . . . : \n")); + _tprintf(_T("\tPrimary DNS Suffix. . . . . . . . : %s\n"), (pszDomainName != NULL) ? pszDomainName : ""); _tprintf(_T("\tNode Type . . . . . . . . . . . . : %s\n"), GetNodeTypeName(pFixedInfo->NodeType)); if (pFixedInfo->EnableRouting) _tprintf(_T("\tIP Routing Enabled. . . . . . . . : Yes\n")); @@ -569,7 +577,15 @@ VOID ShowInfo(BOOL bAll) _tprintf(_T("\tWINS Proxy enabled. . . . . . . . : Yes\n")); else _tprintf(_T("\tWINS Proxy enabled. . . . . . . . : No\n")); - _tprintf(_T("\tDNS Suffix Search List. . . . . . : %s\n"), pFixedInfo->DomainName); + if (pszDomainName != NULL && pszDomainName[0] != 0) + { + _tprintf(_T("\tDNS Suffix Search List. . . . . . : %s\n"), pszDomainName); + _tprintf(_T("\t %s\n"), pFixedInfo->DomainName); + } + else + { + _tprintf(_T("\tDNS Suffix Search List. . . . . . : %s\n"), pFixedInfo->DomainName); + } } while (pAdapter) @@ -682,7 +698,11 @@ VOID ShowInfo(BOOL bAll) pAdapter = pAdapter->Next; } - HeapFree(ProcessHeap, 0, pFixedInfo); +done: + if (pszDomainName) + HeapFree(ProcessHeap, 0, pszDomainName); + if (pFixedInfo) + HeapFree(ProcessHeap, 0, pFixedInfo); if (pAdapterInfo) HeapFree(ProcessHeap, 0, pAdapterInfo); } @@ -826,6 +846,12 @@ FlushDns(VOID) DoFormatMessage(GetLastError()); } +VOID +RegisterDns(VOID) +{ + /* FIXME */ + _tprintf(_T("\nSorry /registerdns is not implemented yet\n")); +} static VOID @@ -1089,7 +1115,7 @@ int main(int argc, char *argv[]) else if (DoFlushdns) FlushDns(); else if (DoRegisterdns) - _tprintf(_T("\nSorry /registerdns is not implemented yet\n")); + RegisterDns(); else if (DoDisplaydns) DisplayDns(); else

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2020