Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [NTOSKRNL] Don't lock file object on close if we're not called by Ob
by Pierre Schweitzer 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf25432eedcd6c071912c… commit cf25432eedcd6c071912c54e55f219104faf83f1 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 29 16:21:44 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 29 16:25:58 2018 +0200 [NTOSKRNL] Don't lock file object on close if we're not called by Ob IopCloseFile can be called by IopDeleteFile. In that situation, it doesn't set any process as first parameter. Furthermore, we are in a situation where it's not required to lock the file object (see the assert before the call). --- ntoskrnl/io/iomgr/file.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index e7633a331f..c10729080d 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -2033,7 +2033,11 @@ IopCloseFile(IN PEPROCESS Process OPTIONAL, FileObject->Flags |= FO_HANDLE_CREATED; /* Check if this is a sync FO and lock it */ - if (FileObject->Flags & FO_SYNCHRONOUS_IO) IopLockFileObject(FileObject); + if (Process != NULL && + BooleanFlagOn(FileObject->Flags, FO_SYNCHRONOUS_IO)) + { + IopLockFileObject(FileObject); + } /* Clear and set up Events */ KeClearEvent(&FileObject->Event); @@ -2078,7 +2082,11 @@ IopCloseFile(IN PEPROCESS Process OPTIONAL, IoFreeIrp(Irp); /* Release the lock if we were holding it */ - if (FileObject->Flags & FO_SYNCHRONOUS_IO) IopUnlockFileObject(FileObject); + if (Process != NULL && + BooleanFlagOn(FileObject->Flags, FO_SYNCHRONOUS_IO)) + { + IopUnlockFileObject(FileObject); + } } NTSTATUS

1 0

01/01: [DESK.CPL] Remove monitor resource scaling (#876)
by Abdulganiev Rafael 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f138e2811210a748ebec… commit 6f138e2811210a748ebec151dceceb89713080df Author: Abdulganiev Rafael <40519766+A-Rafael(a)users.noreply.github.com> AuthorDate: Sat Sep 29 18:24:10 2018 +0400 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 29 16:24:10 2018 +0200 [DESK.CPL] Remove monitor resource scaling (#876) --- dll/cpl/desk/background.c | 8 ++++---- dll/cpl/desk/lang/bg-BG.rc | 2 +- dll/cpl/desk/lang/cs-CZ.rc | 2 +- dll/cpl/desk/lang/de-DE.rc | 2 +- dll/cpl/desk/lang/el-GR.rc | 2 +- dll/cpl/desk/lang/en-GB.rc | 2 +- dll/cpl/desk/lang/en-US.rc | 2 +- dll/cpl/desk/lang/es-ES.rc | 2 +- dll/cpl/desk/lang/et-EE.rc | 2 +- dll/cpl/desk/lang/fr-FR.rc | 2 +- dll/cpl/desk/lang/he-IL.rc | 2 +- dll/cpl/desk/lang/hu-HU.rc | 2 +- dll/cpl/desk/lang/id-ID.rc | 2 +- dll/cpl/desk/lang/it-IT.rc | 2 +- dll/cpl/desk/lang/ja-JP.rc | 2 +- dll/cpl/desk/lang/nl-NL.rc | 2 +- dll/cpl/desk/lang/no-NO.rc | 2 +- dll/cpl/desk/lang/pl-PL.rc | 2 +- dll/cpl/desk/lang/pt-BR.rc | 2 +- dll/cpl/desk/lang/ro-RO.rc | 2 +- dll/cpl/desk/lang/ru-RU.rc | 2 +- dll/cpl/desk/lang/sk-SK.rc | 2 +- dll/cpl/desk/lang/sq-AL.rc | 2 +- dll/cpl/desk/lang/sv-SE.rc | 2 +- dll/cpl/desk/lang/tr-TR.rc | 2 +- dll/cpl/desk/lang/uk-UA.rc | 2 +- dll/cpl/desk/lang/zh-CN.rc | 2 +- dll/cpl/desk/lang/zh-TW.rc | 2 +- dll/cpl/desk/resources/monitor.bmp | Bin 31722 -> 20278 bytes 29 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dll/cpl/desk/background.c b/dll/cpl/desk/background.c index 55b400b4e2..1e12963b35 100644 --- a/dll/cpl/desk/background.c +++ b/dll/cpl/desk/background.c @@ -41,10 +41,10 @@ typedef enum * layout of the monitor image and they must be adjusted * if that image will be changed. */ -#define MONITOR_LEFT 18 -#define MONITOR_TOP 18 -#define MONITOR_RIGHT 168 -#define MONITOR_BOTTOM 128 +#define MONITOR_LEFT 20 +#define MONITOR_TOP 8 +#define MONITOR_RIGHT 140 +#define MONITOR_BOTTOM 92 #define MONITOR_WIDTH (MONITOR_RIGHT-MONITOR_LEFT) #define MONITOR_HEIGHT (MONITOR_BOTTOM-MONITOR_TOP) diff --git a/dll/cpl/desk/lang/bg-BG.rc b/dll/cpl/desk/lang/bg-BG.rc index 51d2c442d8..dfaac01067 100644 --- a/dll/cpl/desk/lang/bg-BG.rc +++ b/dll/cpl/desk/lang/bg-BG.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Работна площ" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Изберете изображение за украса на работната си площ", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/cs-CZ.rc b/dll/cpl/desk/lang/cs-CZ.rc index 440317d669..a0c786486b 100644 --- a/dll/cpl/desk/lang/cs-CZ.rc +++ b/dll/cpl/desk/lang/cs-CZ.rc @@ -11,7 +11,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Pozadí" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Vyberte obrázek, který chcete použít jako pozadí", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/de-DE.rc b/dll/cpl/desk/lang/de-DE.rc index d145563c28..f56f5e0d40 100644 --- a/dll/cpl/desk/lang/de-DE.rc +++ b/dll/cpl/desk/lang/de-DE.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Desktop" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Hintergrundbild", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/el-GR.rc b/dll/cpl/desk/lang/el-GR.rc index b0c098c57a..c8a957361b 100644 --- a/dll/cpl/desk/lang/el-GR.rc +++ b/dll/cpl/desk/lang/el-GR.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Φόντο" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Επιλέξτε Φόντο", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/en-GB.rc b/dll/cpl/desk/lang/en-GB.rc index baf8027151..c31b934efe 100644 --- a/dll/cpl/desk/lang/en-GB.rc +++ b/dll/cpl/desk/lang/en-GB.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Background" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Select an image to use as your des&ktop wallpaper", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/en-US.rc b/dll/cpl/desk/lang/en-US.rc index 955c004d75..40ea2f261a 100644 --- a/dll/cpl/desk/lang/en-US.rc +++ b/dll/cpl/desk/lang/en-US.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Background" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Select an image to use as your des&ktop wallpaper", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/es-ES.rc b/dll/cpl/desk/lang/es-ES.rc index e25acff7ff..e77eb64e7b 100644 --- a/dll/cpl/desk/lang/es-ES.rc +++ b/dll/cpl/desk/lang/es-ES.rc @@ -14,7 +14,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Escritorio" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "&Fondo de escritorio", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/et-EE.rc b/dll/cpl/desk/lang/et-EE.rc index 44e90d4ec3..73f08d3a77 100644 --- a/dll/cpl/desk/lang/et-EE.rc +++ b/dll/cpl/desk/lang/et-EE.rc @@ -12,7 +12,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Taust" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Taust:", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/fr-FR.rc b/dll/cpl/desk/lang/fr-FR.rc index ae84114ca9..cd0aa31be6 100644 --- a/dll/cpl/desk/lang/fr-FR.rc +++ b/dll/cpl/desk/lang/fr-FR.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Fond d'écran" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Sélectionnez une image à utiliser comme fond d'écran", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/he-IL.rc b/dll/cpl/desk/lang/he-IL.rc index 792566eb1a..edfc0e4df2 100644 --- a/dll/cpl/desk/lang/he-IL.rc +++ b/dll/cpl/desk/lang/he-IL.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "רקע" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "בחר תמונה שתשמש כרקע שולחן העבודה שלך:", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/hu-HU.rc b/dll/cpl/desk/lang/hu-HU.rc index 4b75982185..4834eb711b 100644 --- a/dll/cpl/desk/lang/hu-HU.rc +++ b/dll/cpl/desk/lang/hu-HU.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Háttér" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Válasszon ki egy képet az asztala hátterének", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/id-ID.rc b/dll/cpl/desk/lang/id-ID.rc index ba5efe1005..e411ac7fea 100644 --- a/dll/cpl/desk/lang/id-ID.rc +++ b/dll/cpl/desk/lang/id-ID.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Latar Belakang" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Pilih gambar untuk dipakai sebagai desktop wallpaper anda", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/it-IT.rc b/dll/cpl/desk/lang/it-IT.rc index e0c9b5ca72..4ea905a148 100644 --- a/dll/cpl/desk/lang/it-IT.rc +++ b/dll/cpl/desk/lang/it-IT.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sfondo" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Selezionare un'immagine da usare come sfondo per il desktop", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/ja-JP.rc b/dll/cpl/desk/lang/ja-JP.rc index d1694cf569..ee0699297e 100644 --- a/dll/cpl/desk/lang/ja-JP.rc +++ b/dll/cpl/desk/lang/ja-JP.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "背景" FONT 9, "MS UI Gothic" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "デスクトップの壁紙として使う画像を選択してください:", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/nl-NL.rc b/dll/cpl/desk/lang/nl-NL.rc index c605f8727c..9b696bfb73 100644 --- a/dll/cpl/desk/lang/nl-NL.rc +++ b/dll/cpl/desk/lang/nl-NL.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Achtergrond" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Kies een afbeelding als bureaublad achtergrond", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/no-NO.rc b/dll/cpl/desk/lang/no-NO.rc index 1c6a23db8e..7617c7dcd9 100644 --- a/dll/cpl/desk/lang/no-NO.rc +++ b/dll/cpl/desk/lang/no-NO.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Bakgrunn" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Velg et bilde som du vil bruke som skrivebordbakgrunn", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/pl-PL.rc b/dll/cpl/desk/lang/pl-PL.rc index 464afdcfa7..0c7cd8adac 100644 --- a/dll/cpl/desk/lang/pl-PL.rc +++ b/dll/cpl/desk/lang/pl-PL.rc @@ -14,7 +14,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Pulpit" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Wybierz obraz do użycia jako tapeta pulpitu", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/pt-BR.rc b/dll/cpl/desk/lang/pt-BR.rc index bd8d7bf6e1..4aa6d50a9f 100644 --- a/dll/cpl/desk/lang/pt-BR.rc +++ b/dll/cpl/desk/lang/pt-BR.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Área de trabalho" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "&Plano de fundo:", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/ro-RO.rc b/dll/cpl/desk/lang/ro-RO.rc index 570a326f71..33b766ba6f 100644 --- a/dll/cpl/desk/lang/ro-RO.rc +++ b/dll/cpl/desk/lang/ro-RO.rc @@ -10,7 +10,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Fundal" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Alegeți o imagine pentru a o folosi ca decor de birou.", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/ru-RU.rc b/dll/cpl/desk/lang/ru-RU.rc index ad0efd3287..022e6ed729 100644 --- a/dll/cpl/desk/lang/ru-RU.rc +++ b/dll/cpl/desk/lang/ru-RU.rc @@ -5,7 +5,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Рабочий стол" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Выберите изображение для рабочего стола", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/sk-SK.rc b/dll/cpl/desk/lang/sk-SK.rc index b6d46d2ba9..9046b95dd9 100644 --- a/dll/cpl/desk/lang/sk-SK.rc +++ b/dll/cpl/desk/lang/sk-SK.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Pozadie" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Vyberte obrázok, ktorý chcete použiť ako pozadie pracovnej plochy", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/sq-AL.rc b/dll/cpl/desk/lang/sq-AL.rc index 34a4e5134b..fe7188b522 100644 --- a/dll/cpl/desk/lang/sq-AL.rc +++ b/dll/cpl/desk/lang/sq-AL.rc @@ -9,7 +9,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sfond" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Zgjidhni një imazh për t'u përdorur si sfond tuaj desktop", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/sv-SE.rc b/dll/cpl/desk/lang/sv-SE.rc index 4be8ddb787..1ea71fc3b4 100644 --- a/dll/cpl/desk/lang/sv-SE.rc +++ b/dll/cpl/desk/lang/sv-SE.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Bakgrund" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Välj en bild du vill ha som skrivbordsunderlägg", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/tr-TR.rc b/dll/cpl/desk/lang/tr-TR.rc index b38165b521..129deb7bb2 100644 --- a/dll/cpl/desk/lang/tr-TR.rc +++ b/dll/cpl/desk/lang/tr-TR.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Arka Plan" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Duvar kağıdınız olarak kullanmak için bir resim seçiniz.", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/uk-UA.rc b/dll/cpl/desk/lang/uk-UA.rc index b8c925f546..1937ae9022 100644 --- a/dll/cpl/desk/lang/uk-UA.rc +++ b/dll/cpl/desk/lang/uk-UA.rc @@ -13,7 +13,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Робочий стіл" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "Виберіть зображення для шпалер робочого столу", IDC_STATIC, 8, 93, 238, 9 diff --git a/dll/cpl/desk/lang/zh-CN.rc b/dll/cpl/desk/lang/zh-CN.rc index 952df92517..6f8daf225a 100644 --- a/dll/cpl/desk/lang/zh-CN.rc +++ b/dll/cpl/desk/lang/zh-CN.rc @@ -13,7 +13,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "背景" FONT 9, "宋体" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "墙纸:", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/lang/zh-TW.rc b/dll/cpl/desk/lang/zh-TW.rc index 6a8d6f5537..3254325b61 100644 --- a/dll/cpl/desk/lang/zh-TW.rc +++ b/dll/cpl/desk/lang/zh-TW.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "背景" FONT 9, "新細明體" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 6, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 LTEXT "牆紙:", IDC_STATIC, 8, 93, 230, 9 diff --git a/dll/cpl/desk/resources/monitor.bmp b/dll/cpl/desk/resources/monitor.bmp index e81c7b5b19..5cf3ed310a 100644 Binary files a/dll/cpl/desk/resources/monitor.bmp and b/dll/cpl/desk/resources/monitor.bmp differ

1 0

05/05: [SYSDM] Add hardware model name print
by Stanislav Motylkov 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4eccca5943b124ca63488… commit 4eccca5943b124ca63488206fb526a20f07070df Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Aug 16 22:31:03 2018 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Sep 29 17:12:18 2018 +0300 [SYSDM] Add hardware model name print --- dll/cpl/sysdm/CMakeLists.txt | 6 + dll/cpl/sysdm/general.c | 10 + dll/cpl/sysdm/precomp.h | 3 + dll/cpl/sysdm/smbios.c | 605 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 624 insertions(+) diff --git a/dll/cpl/sysdm/CMakeLists.txt b/dll/cpl/sysdm/CMakeLists.txt index d05aba0520..f65d7352b5 100644 --- a/dll/cpl/sysdm/CMakeLists.txt +++ b/dll/cpl/sysdm/CMakeLists.txt @@ -1,6 +1,10 @@ spec2def(sysdm.cpl sysdm.spec) +include_directories( + ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp + ${REACTOS_SOURCE_DIR}/sdk/lib/dmilib) + list(APPEND SOURCE advanced.c environment.c @@ -8,6 +12,7 @@ list(APPEND SOURCE hardprof.c hardware.c licence.c + smbios.c startrec.c sysdm.c userprofile.c @@ -23,6 +28,7 @@ add_library(sysdm SHARED ${CMAKE_CURRENT_BINARY_DIR}/sysdm.def) set_module_type(sysdm cpl UNICODE) +target_link_libraries(sysdm udmihelp) add_importlibs(sysdm advapi32 setupapi user32 gdi32 comctl32 msimg32 shell32 shlwapi ole32 powrprof msvcrt kernel32 ntdll) add_pch(sysdm precomp.h SOURCE) add_cd_file(TARGET sysdm DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index 15eb70ba6e..85f83fa642 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -423,8 +423,18 @@ static VOID GetSystemInformation(HWND hwnd) TCHAR ProcKey[] = _T("HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0"); MEMORYSTATUSEX MemStat; TCHAR Buf[32]; + WCHAR SMBiosName[96]; INT CurMachineLine = IDC_MACHINELINE1; + /* + * Get hardware device name or motherboard name + * using information from raw SMBIOS data + */ + if (GetSystemName(SMBiosName, _countof(SMBiosName))) + { + SetDlgItemText(hwnd, CurMachineLine, SMBiosName); + CurMachineLine++; + } /* * Get Processor information * although undocumented, this information is being pulled diff --git a/dll/cpl/sysdm/precomp.h b/dll/cpl/sysdm/precomp.h index 5b362c7ed2..5756e5cc5e 100644 --- a/dll/cpl/sysdm/precomp.h +++ b/dll/cpl/sysdm/precomp.h @@ -48,6 +48,9 @@ INT_PTR CALLBACK StartRecDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM INT_PTR CALLBACK VirtMemDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK LicenceDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +/* System information */ +BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf); + typedef struct _PAGEFILE { TCHAR szDrive[3]; diff --git a/dll/cpl/sysdm/smbios.c b/dll/cpl/sysdm/smbios.c new file mode 100644 index 0000000000..5aeb627edc --- /dev/null +++ b/dll/cpl/sysdm/smbios.c @@ -0,0 +1,605 @@ +/* + * PROJECT: ReactOS System Control Panel Applet + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/cpl/sysdm/smbios.c + * PURPOSE: Retrieve device or motherboard name identifier from DMI/SMBIOS + * COPYRIGHT: Copyright 2018 Stanislav Motylkov <x86corez(a)gmail.com> + * + */ + +#include "precomp.h" + +#include <strsafe.h> +#include <udmihelp.h> +#include <dmilib.h> + +typedef struct GENERIC_NAME +{ + PCWSTR pwName; + BOOL bCaseSensitive; +} GENERIC_NAME; + +typedef struct VENDOR_LONG_NAME +{ + PCWSTR pwLongName; + PCWSTR pwShortName; +} VENDOR_LONG_NAME; + +typedef struct REDUNDANT_WORD +{ + PCWSTR pwStr; + BOOL bReplaceFirstWord; +} REDUNDANT_WORD; + +static +BOOL +IsPunctuation( + _In_ WCHAR chr) +{ + return (chr <= L' ' || chr == L'.' || chr == L','); +} + +/* + * Trim redundant characters + */ +static +VOID +TrimPunctuation( + _Inout_ PWSTR pStr) +{ + SIZE_T Length; + UINT i = 0; + + if (!pStr) + return; + + Length = wcslen(pStr); + if (Length == 0) + return; + + /* Trim leading characters */ + while (i < Length && IsPunctuation(pStr[i])) + { + i++; + } + + if (i > 0) + { + Length -= i; + memmove(pStr, pStr + i, (Length + 1) * sizeof(WCHAR)); + } + + /* Trim trailing characters */ + while (Length && IsPunctuation(pStr[Length-1])) + { + pStr[Length-1] = L'\0'; + --Length; + } +} + +/* + * Case insensitive variant of wcsstr + */ +static +wchar_t * wcsistr(const wchar_t *s, const wchar_t *b) +{ + wchar_t *x; + wchar_t *y; + wchar_t *c; + x = (wchar_t *)s; + while (*x) + { + if (towlower(*x) == towlower(*b)) + { + y = x; + c = (wchar_t *)b; + while (*y && *c && towlower(*y) == towlower(*c)) + { + c++; + y++; + } + if (!*c) + return x; + } + x++; + } + return NULL; +} + +static +wchar_t * wcsistr_plus(const wchar_t *s, wchar_t *b) +{ + wchar_t * result = wcsistr(s, b); + UINT len = wcslen(b); + // workarounds + if (!result && b[len - 1] == L' ' && wcschr(s, L',') != NULL) + { + b[len - 1] = L','; + result = wcsistr(s, b); + b[len - 1] = L' '; + if (!result) + { + b[0] = L','; + result = wcsistr(s, b); + b[0] = L' '; + } + } + if (!result && b[len - 1] == L' ' && wcschr(s, L'(') != NULL) + { + b[len - 1] = L'('; + result = wcsistr(s, b); + b[len - 1] = L' '; + } + if (!result && b[len - 1] == L' ' && wcschr(s, L'_') != NULL) + { + b[0] = L'_'; + result = wcsistr(s, b); + b[0] = L' '; + } + if (!result && b[0] == L' ' && b[len - 1] == L' ' && wcschr(s, L')') != NULL) + { + b[0] = L')'; + result = wcsistr(s, b); + b[0] = L' '; + } + return result; +} + +/* + * Replaces full word with another shorter word + */ +static +VOID wcsrep( + _Inout_ PWSTR pwStr, + _In_ PCWSTR pwFind, + _In_ PCWSTR pwReplace, + _In_ BOOL bReplaceFirstWord) +{ + PWSTR pwsStr, pwsFind, pwsReplace, pwsBuf = NULL; + SIZE_T lenStr; + SIZE_T lenFind; + SIZE_T lenReplace; + + if (!pwStr || !pwFind || !pwReplace || + wcslen(pwStr) == 0 || + wcslen(pwFind) == 0 || + wcslen(pwFind) < wcslen(pwReplace)) + { + return; + } + lenStr = wcslen(pwStr) + 2 + 1; + lenFind = wcslen(pwFind) + 2 + 1; + lenReplace = wcslen(pwReplace) + 2 + 1; + + pwsStr = HeapAlloc(GetProcessHeap(), 0, lenStr * sizeof(WCHAR)); + if (!pwsStr) + { + return; + } + StringCchCopyW(pwsStr, lenStr, L" "); + StringCchCatW(pwsStr, lenStr, pwStr); + StringCchCatW(pwsStr, lenStr, L" "); + + pwsFind = HeapAlloc(GetProcessHeap(), 0, lenFind * sizeof(WCHAR)); + if (!pwsFind) + { + goto freeStr; + } + StringCchCopyW(pwsFind, lenFind, L" "); + StringCchCatW(pwsFind, lenFind, pwFind); + StringCchCatW(pwsFind, lenFind, L" "); + + if (!(pwsBuf = wcsistr_plus(pwsStr, pwsFind))) + { + goto freeFind; + } + if (!bReplaceFirstWord && pwsBuf - pwsStr < 2) + { + goto freeFind; + } + + pwsReplace = HeapAlloc(GetProcessHeap(), 0, lenReplace * sizeof(WCHAR)); + if (!pwsReplace) + { + goto freeFind; + } + StringCchCopyW(pwsReplace, lenReplace, L" "); + StringCchCatW(pwsReplace, lenReplace, pwReplace); + StringCchCatW(pwsReplace, lenReplace, L" "); + + do + { + // replace substring + memmove(pwsBuf, pwsReplace, (lenReplace - 1) * sizeof(WCHAR)); + // shift characters + memmove(pwsBuf + lenReplace - (wcslen(pwReplace) > 0 ? 1 : 2), pwsBuf + lenFind - 1, (lenStr - lenFind - (pwsBuf - pwsStr) + 1) * sizeof(WCHAR)); + } + while ((pwsBuf = wcsistr_plus(pwsStr, pwsFind)) != NULL); + + TrimDmiStringW(pwsStr); + StringCchCopyW(pwStr, wcslen(pwStr), pwsStr); + + HeapFree(GetProcessHeap(), 0, pwsReplace); +freeFind: + HeapFree(GetProcessHeap(), 0, pwsFind); +freeStr: + HeapFree(GetProcessHeap(), 0, pwsStr); +} + +static +BOOL IsGenericSystemName(PCWSTR ven, PCWSTR dev) +{ + static const GENERIC_NAME Vendors[] = + { + { L"To Be Filled By O.E.M.", FALSE }, // some ASUS boards + { L"System manufacturer", TRUE }, // some ASUS boards + { L"Default string", TRUE }, // some Gigabyte boards + { L"LTD Delovoy Office", TRUE }, // some Gigabyte boards + { L"O.E.M", TRUE }, // some AMD boards + { L"DEPO Computers", TRUE }, // various boards + }; + static const GENERIC_NAME Devices[] = + { + { L"To Be Filled By O.E.M.", FALSE }, // some ASUS boards + { L"All Series", TRUE }, // some ASUS boards + { L"System Product Name", TRUE }, // some ASUS boards + { L"Default string", TRUE }, // some Gigabyte boards + { L"Please change product name", TRUE }, // some MSI boards + { L"Computer", TRUE }, // some Intel boards + { L"ChiefRiver Platform", TRUE }, // some Intel boards + { L"SharkBay Platform", TRUE }, // some Intel boards + { L"HuronRiver Platform", TRUE }, // some Intel boards + { L"SandyBridge Platform", TRUE }, // some Intel boards + { L"Broadwell Platform", TRUE }, // some LG boards + { L"Sabine Platform", TRUE }, // some AMD boards + { L"O.E.M", TRUE }, // some AMD boards + { L"*", TRUE }, // various boards + { L"GEG", TRUE }, // various boards + { L"OEM", TRUE }, // various boards + { L"DEPO Computers", TRUE }, // various boards + { L"Aquarius Pro, Std, Elt Series", TRUE }, // some Foxconn boards + { L"Aquarius Server", TRUE }, // some ASUS server boards + { L"Aquarius Server G2", TRUE }, // some ASUS server boards + { L"Super Server", TRUE }, // some Supermicro server boards + { L"POSITIVO MOBILE", FALSE }, // some Positivo devices + }; + BOOL bMatch; + UINT i; + + for (i = 0; i < _countof(Vendors); i++) + { + if (!ven) + { + break; + } + if (Vendors[i].bCaseSensitive) + { + bMatch = !wcscmp(ven, Vendors[i].pwName); + } + else + { + bMatch = !wcsicmp(ven, Vendors[i].pwName); + } + if (bMatch) + { + return TRUE; + } + } + + for (i = 0; i < _countof(Devices); i++) + { + if (!dev) + { + break; + } + if (Devices[i].bCaseSensitive) + { + bMatch = !wcscmp(dev, Devices[i].pwName); + } + else + { + bMatch = !wcsicmp(dev, Devices[i].pwName); + } + if (bMatch) + { + return TRUE; + } + } + return FALSE; +} + +static +void AppendSystemFamily(PWSTR pBuf, SIZE_T cchBuf, PCHAR * DmiStrings, PWSTR dev) +{ + static const PCSTR KnownFamilies[] = + { + "Eee PC", // ASUS + "IdeaPad", // Lenovo + "IdeaCentre", // Lenovo + }; + static const PCWSTR Aliases[] = + { + NULL, + NULL, + L"IdeaCenter", + }; + UINT i; + WCHAR wideStr[128]; + + for (i = 0; i < _countof(KnownFamilies); i++) + { + StringCchPrintfW(wideStr, _countof(wideStr), L"%S", KnownFamilies[i]); + + if (wcsistr(dev, wideStr) == NULL && + (!Aliases[i] || wcsistr(dev, Aliases[i]) == NULL) && + !stricmp(DmiStrings[SYS_FAMILY], KnownFamilies[i])) + { + if (wcslen(pBuf) > 0 && wcslen(dev) > 0) + { + StringCchCatW(pBuf, cchBuf, L" "); + } + StringCchCatW(pBuf, cchBuf, wideStr); + } + } +} + +BOOL GetSystemName(PWSTR pBuf, SIZE_T cchBuf) +{ + static const VENDOR_LONG_NAME LongNames[] = + { + { L"ASUSTeK", L"ASUS" }, + { L"First International Computer", L"FIC" }, + { L"Hewlett-Packard", L"HP" }, + { L"MICRO-STAR", L"MSI" }, + { L"SGI.COM", L"SGI" }, + { L"Silicon Graphics International", L"SGI" }, + { L"InformationComputerSystems", L"ICS" }, + { L"CHUWI INNOVATION AND TECHNOLOGY", L"CHUWI" }, + { L"http://www.abit.com.tw/", L"ABIT" }, + { L"www.abit.com.tw", L"ABIT" }, + { L"Colorful Technology And Development", L"Colorful" }, + { L"HaierComputer", L"Haier" }, + }; + static const REDUNDANT_WORD RedundantWords[] = + { + { L"Corporation", FALSE }, + { L"Computer", FALSE }, + { L"Computers", FALSE }, + { L"Group", FALSE }, + { L"Cloud", FALSE }, + { L"Center", FALSE }, + { L"Systems", FALSE }, + { L"Microsystems", FALSE }, + { L"Infosystems", FALSE }, + { L"Electronics", FALSE }, + { L"Electric", FALSE }, + { L"Software", FALSE }, + { L"International", FALSE }, + { L"Interantonal", FALSE }, // on purpose (some MSI boards) + { L"Industrial", FALSE }, + { L"Information", FALSE }, + { L"Technology", FALSE }, + { L"Tecohnology", FALSE }, // on purpose (some Gigabyte boards) + { L"Technologies", FALSE }, + { L"Limited", FALSE }, + { L"Int", FALSE }, + { L"Inc", FALSE }, + { L"Co", FALSE }, + { L"Corp", FALSE }, + { L"Crop", FALSE }, + { L"Ltd", FALSE }, + { L"GmbH", FALSE }, + { L"S.p.A", FALSE }, + { L"S.A", FALSE }, + { L"SA", FALSE }, + { L"SAS", FALSE }, + { L"BV", FALSE }, + { L"AG", FALSE }, + { L"OOO", TRUE }, + { L"CJSC", FALSE }, + { L"INT'L", FALSE }, + { L"plc", FALSE }, + }; + PVOID SMBiosBuf; + PCHAR DmiStrings[ID_STRINGS_MAX] = { 0 }; + WCHAR ven[512], dev[512]; + BOOL bGenericName; + UINT i; + PWCHAR j; + + SMBiosBuf = LoadSMBiosData(DmiStrings); + if (!SMBiosBuf) + { + return FALSE; + } + + GetSMBiosStringW(DmiStrings[SYS_VENDOR], ven, _countof(ven), TRUE); + GetSMBiosStringW(DmiStrings[SYS_PRODUCT], dev, _countof(dev), TRUE); + bGenericName = IsGenericSystemName(ven, dev); + + if (wcslen(dev) == 0 || + !wcscmp(dev, ven) || + bGenericName) + { + // system strings are unusable, use board strings + if (DmiStrings[BOARD_VENDOR] != NULL || !bGenericName) + { + if ((DmiStrings[BOARD_VENDOR] && + strlen(DmiStrings[BOARD_VENDOR]) >= 2 && + strstr(DmiStrings[BOARD_VENDOR], " ") != DmiStrings[BOARD_VENDOR]) || + IsGenericSystemName(ven, NULL)) + { + GetSMBiosStringW(DmiStrings[BOARD_VENDOR], ven, _countof(ven), TRUE); + } + GetSMBiosStringW(DmiStrings[BOARD_NAME], dev, _countof(dev), TRUE); + + if (IsGenericSystemName(ven, NULL)) + { + *ven = 0; + } + if (IsGenericSystemName(NULL, dev)) + { + *dev = 0; + } + if (wcslen(dev) == 0 && + DmiStrings[SYS_VERSION] != NULL) + { + GetSMBiosStringW(DmiStrings[SYS_VERSION], dev, _countof(dev), TRUE); + + if (IsGenericSystemName(NULL, dev)) + { + *dev = 0; + } + } + if (wcslen(dev) == 0 && + DmiStrings[BOARD_VERSION] != NULL) + { + GetSMBiosStringW(DmiStrings[BOARD_VERSION], dev, _countof(dev), TRUE); + + if (IsGenericSystemName(NULL, dev)) + { + *dev = 0; + } + } + } + + if (wcslen(ven) == 0 && wcslen(dev) == 0) + { + // board strings are empty, use BIOS vendor string + GetSMBiosStringW(DmiStrings[BIOS_VENDOR], ven, _countof(ven), TRUE); + } + } + else + { + if (wcslen(ven) < 2) + { + GetSMBiosStringW(DmiStrings[BOARD_VENDOR], ven, _countof(ven), TRUE); + + if (IsGenericSystemName(ven, NULL)) + { + *ven = 0; + } + } + } + + // workaround for LORD ELECTRONICS + if (((j = wcsstr(ven, L" ")) != NULL) && (j - ven > 2)) + { + i = j - ven; + if (!wcsncmp(ven + wcslen(ven) - i, ven, i)) + { + ven[wcslen(ven) - i] = L'\0'; + } + } + + // make vendor strings shorter + for (i = 0; i < _countof(LongNames); i++) + { + wcsrep(ven, LongNames[i].pwLongName, LongNames[i].pwShortName, TRUE); + } + + // remove redundant words + for (i = 0; i < _countof(RedundantWords); i++) + { + wcsrep(ven, RedundantWords[i].pwStr, L"", RedundantWords[i].bReplaceFirstWord); + } + for (i = 0; i < _countof(RedundantWords); i++) + { + StringCchCopyW(pBuf, cchBuf, RedundantWords[i].pwStr); + StringCchCatW(pBuf, cchBuf, L"."); + wcsrep(ven, pBuf, L"", RedundantWords[i].bReplaceFirstWord); + } + + // workaround for LENOVO notebooks + if (!wcscmp(ven, L"LENOVO")) + { + StringCchCopyW(ven, _countof(ven), L"Lenovo"); + + if (stricmp(DmiStrings[SYS_VERSION], "Lenovo") && + stricmp(DmiStrings[SYS_VERSION], "Lenovo Product") && + stricmp(DmiStrings[SYS_VERSION], " ") && + _strnicmp(DmiStrings[SYS_VERSION], " ", 3) && + wcsistr(dev, L"IdeaPad ") == NULL && + wcsistr(dev, L"ThinkServer ") == NULL) + { + GetSMBiosStringW(DmiStrings[SYS_VERSION], dev, _countof(dev), TRUE); + } + + if (wcsstr(dev, L"Lenovo-") == dev) + { + // replace "-" with space + dev[6] = L' '; + } + + if (!wcscmp(dev, L"Lenovo")) + { + GetSMBiosStringW(DmiStrings[BOARD_NAME], dev, _countof(dev), TRUE); + } + } + if (!wcscmp(ven, L"IBM") && + DmiStrings[SYS_VERSION] != NULL && + strstr(DmiStrings[SYS_VERSION], "ThinkPad ") != NULL) + { + GetSMBiosStringW(DmiStrings[SYS_VERSION], dev, _countof(dev), TRUE); + } + + // workaround for DEXP + if (!wcscmp(ven, L"DEXP")) + { + if (!stricmp(DmiStrings[SYS_PRODUCT], "Tablet PC") + && DmiStrings[SYS_VERSION] != NULL) + { + GetSMBiosStringW(DmiStrings[SYS_VERSION], dev, _countof(dev), TRUE); + } + } + + // workaround for Razer Blade + if (!wcscmp(ven, L"Razer") && !wcscmp(dev, L"Blade")) + { + if (DmiStrings[SYS_VERSION] != NULL) + { + StringCchCopyW(ven, _countof(ven), L"Razer Blade"); + GetSMBiosStringW(DmiStrings[SYS_VERSION], dev, _countof(dev), TRUE); + } + } + + // workaround for MSI motherboards + if (!wcscmp(ven, L"MSI") && + wcsstr(dev, L"MS-") != NULL && + DmiStrings[BOARD_NAME] != NULL && + strstr(DmiStrings[BOARD_NAME], "(MS-") != NULL) + { + GetSMBiosStringW(DmiStrings[BOARD_NAME], dev, _countof(dev), TRUE); + } + if (wcslen(ven) == 0 && + wcsstr(dev, L"MS-") == dev) + { + StringCchCopyW(ven, _countof(ven), L"MSI"); + } + + // trim redundant characters + TrimPunctuation(ven); + TrimPunctuation(dev); + + if (wcsistr(dev, ven) == dev || + (!wcscmp(ven, L"ASUS") && wcsstr(dev, L"ASUS") != NULL) || + (!wcscmp(ven, L"HP") && wcsstr(dev, L" by HP") != NULL)) + { + // device string contains vendor string, use second only + StringCchCopyW(pBuf, cchBuf, dev); + } + else + { + StringCchCopyW(pBuf, cchBuf, ven); + AppendSystemFamily(pBuf, cchBuf, DmiStrings, dev); + if (wcslen(pBuf) > 0 && wcslen(dev) > 0) + { + StringCchCatW(pBuf, cchBuf, L" "); + } + StringCchCatW(pBuf, cchBuf, dev); + } + + FreeSMBiosData(SMBiosBuf); + + return (wcslen(pBuf) > 0); +}

1 0

04/05: [SYSDM] Add one more IDC_MACHINELINE for model name
by Stanislav Motylkov 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=797d2354faf98698313b3… commit 797d2354faf98698313b37c33854bfb48c4b217f Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Aug 16 21:53:45 2018 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Sep 29 17:11:57 2018 +0300 [SYSDM] Add one more IDC_MACHINELINE for model name --- dll/cpl/sysdm/lang/bg-BG.rc | 1 + dll/cpl/sysdm/lang/cs-CZ.rc | 1 + dll/cpl/sysdm/lang/da-DK.rc | 1 + dll/cpl/sysdm/lang/de-DE.rc | 1 + dll/cpl/sysdm/lang/el-GR.rc | 1 + dll/cpl/sysdm/lang/en-US.rc | 1 + dll/cpl/sysdm/lang/es-ES.rc | 1 + dll/cpl/sysdm/lang/fr-FR.rc | 1 + dll/cpl/sysdm/lang/he-IL.rc | 1 + dll/cpl/sysdm/lang/hu-HU.rc | 1 + dll/cpl/sysdm/lang/id-ID.rc | 1 + dll/cpl/sysdm/lang/it-IT.rc | 1 + dll/cpl/sysdm/lang/ja-JP.rc | 1 + dll/cpl/sysdm/lang/nl-NL.rc | 1 + dll/cpl/sysdm/lang/no-NO.rc | 1 + dll/cpl/sysdm/lang/pl-PL.rc | 1 + dll/cpl/sysdm/lang/ro-RO.rc | 1 + dll/cpl/sysdm/lang/ru-RU.rc | 1 + dll/cpl/sysdm/lang/sk-SK.rc | 1 + dll/cpl/sysdm/lang/sq-AL.rc | 1 + dll/cpl/sysdm/lang/sv-SE.rc | 1 + dll/cpl/sysdm/lang/tr-TR.rc | 1 + dll/cpl/sysdm/lang/uk-UA.rc | 1 + dll/cpl/sysdm/lang/zh-CN.rc | 1 + dll/cpl/sysdm/lang/zh-TW.rc | 1 + dll/cpl/sysdm/resource.h | 9 +++++---- 26 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index 84108331c8..44ae767c11 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -16,6 +16,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Посетете <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Разрешителното", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index 885a52b7a9..e1ff1acb27 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -21,6 +21,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Navštívit <A HREF=""http://www.reactos.org/"">stránku systému ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Zobrazit &licenci...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index ff2ae22ab9..15379b67a8 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -16,6 +16,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Visit the <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index 8d8a282971..81ba510fff 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -25,6 +25,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "<A HREF=""http://www.reactos.org/"">ReactOS-Homepage</A> besuchen", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Lizenz anzeigen...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index e367bddd5c..188dcb9b7c 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -16,6 +16,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Επισκευτείτε την <A HREF=""http://www.reactos.org/"">Ιστοσελίδα του ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Προβολή άδειας...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index a093177b44..06ee1b548c 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -16,6 +16,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Visit the <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "View &license...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index ada415ebb7..ab0ae13000 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -18,6 +18,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Visite la <A HREF=""http://www.reactos.org/"">página Web de ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Ver &licencia...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index f1cee0c1e2..e77c923a74 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -16,6 +16,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Visiter la <A HREF=""http://www.reactos.org/"">page d'accueil ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Voir la &licence...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index 2538a4c2ed..a9c6a48ad3 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -18,6 +18,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "בקר את <A HREF=""http://www.reactos.org/"">דף הבית של ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "ראה רישיון...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index 75c71af7ee..59de855670 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -18,6 +18,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Visit the <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index c65790438a..0b10792430 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -16,6 +16,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Kunjungi <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Lihat &lisensi...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index 569eace1e4..d1a71a3f70 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -16,6 +16,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Visita <A HREF=""http://www.reactos.org/"">ReactOS su internet</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Vedi la licenza...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index 2488700565..080d29cf46 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -16,6 +16,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "<A HREF=""http://www.reactos.org/"">ReactOS ホームページ</A>へ行く", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "ライセンスを表示(&L)...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index dbeceebb84..5e77f27bc5 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -16,6 +16,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Visit the <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index debeb1e473..3eab75bf21 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -16,6 +16,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Besøk <A HREF=""http://www.reactos.org/no/index.html"">ReactOS Hjemmesiden</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Vis &lisensen...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index dc1fb2c1fa..722d3f2737 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -25,6 +25,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Odwiedź <A HREF=""http://www.reactos.org/"">Stronę domową ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Wyświetl &licencję...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index c455022c2e..1ffee8680f 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -25,6 +25,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Vizitați<A HREF=""http://www.reactos.org/""> pagina web ReactOS </A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Licență…", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 1ec7735330..addfb917c5 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -16,6 +16,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Посетите <A HREF=""http://www.reactos.org/"">домашнюю страницу ReactOS</A>.", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Лицензия...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index b0a46ea8ef..9c89994b2d 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -24,6 +24,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Navštívte <A HREF=""http://www.reactos.org/"">domovskú stránku systému ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Zobraziť &licenciu...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index ad656c358b..1df47f00ad 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -16,6 +16,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Vizitoni <A HREF=""http://www.reactos.org/"">Faqeb ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Shiko &licencës...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index 781e0a8455..7a198c9c6c 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -18,6 +18,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Besök <A HREF=""http://www.reactos.org/"">ReactOS hemsida</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Visa &licens...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index b3fb58dabc..12a3138e10 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -18,6 +18,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "<A HREF=""http://www.reactos.org/"">ReactOS Ana Sayfa</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Ruhsatı Göster...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index 6cb865437d..e358d7de2c 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -24,6 +24,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "Відвідаєте <A HREF=""http://www.reactos.org/"">домашню сторінку ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Ліцензія...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index e68aef5599..6db5d7d9ad 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -19,6 +19,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "访问<A HREF=""http://www.reactos.org/"">ReactOS 主页</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "许可证(&L)...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index ad1264fe3c..5846c9893a 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -18,6 +18,7 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 + LTEXT "", IDC_MACHINELINE6, 130, 173, 118, 9 CONTROL "請訪問<A HREF=""http://www.reactos.org/"">ReactOS 主頁</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "查看版權信息(&L)...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h index f752232bda..1535d8b5a5 100644 --- a/dll/cpl/sysdm/resource.h +++ b/dll/cpl/sysdm/resource.h @@ -56,10 +56,11 @@ #define IDC_MACHINELINE3 103 #define IDC_MACHINELINE4 104 #define IDC_MACHINELINE5 105 -#define IDC_LICENCE 106 -#define IDC_ROSIMG 107 -#define IDC_ROSHOMEPAGE_LINK 108 -#define IDC_ROSVERSION 109 +#define IDC_MACHINELINE6 106 +#define IDC_LICENCE 107 +#define IDC_ROSIMG 108 +#define IDC_ROSHOMEPAGE_LINK 109 +#define IDC_ROSVERSION 110 /* Propsheet - hardware */ #define IDD_PROPPAGEHARDWARE 300

1 0

03/05: [SYSDM] Move system information controls 16 points higher
by Stanislav Motylkov 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd1fc964e75a518a8ec8f… commit bd1fc964e75a518a8ec8f75d050116cf726cd2bb Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Aug 16 21:48:05 2018 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Sep 29 17:11:31 2018 +0300 [SYSDM] Move system information controls 16 points higher --- dll/cpl/sysdm/lang/bg-BG.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/cs-CZ.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/da-DK.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/de-DE.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/el-GR.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/en-US.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/es-ES.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/fr-FR.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/he-IL.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/hu-HU.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/id-ID.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/it-IT.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/ja-JP.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/nl-NL.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/no-NO.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/pl-PL.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/ro-RO.rc | 18 +++++++++--------- dll/cpl/sysdm/lang/ru-RU.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/sk-SK.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/sq-AL.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/sv-SE.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/tr-TR.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/uk-UA.rc | 18 +++++++++--------- dll/cpl/sysdm/lang/zh-CN.rc | 20 ++++++++++---------- dll/cpl/sysdm/lang/zh-TW.rc | 20 ++++++++++---------- 25 files changed, 248 insertions(+), 248 deletions(-) diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index db90a75a43..84108331c8 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -6,16 +6,16 @@ CAPTION "Общи" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Уредба:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Версия:", IDC_ROSVERSION, 10, 153, 131, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Машина:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "Уредба:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Версия:", IDC_ROSVERSION, 10, 137, 131, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Машина:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Посетете <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Разрешителното", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index 7690d097d5..885a52b7a9 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -11,16 +11,16 @@ CAPTION "Obecné" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Systém:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Verze", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Počítač:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "Systém:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Verze", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Počítač:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Navštívit <A HREF=""http://www.reactos.org/"">stránku systému ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Zobrazit &licenci...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index 0bf39c726a..ff2ae22ab9 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -6,16 +6,16 @@ CAPTION "Generelt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Operativsystem:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Machine:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "Operativsystem:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Visit the <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index 572de25233..8d8a282971 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -15,16 +15,16 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "System:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Computer:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "System:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Computer:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "<A HREF=""http://www.reactos.org/"">ReactOS-Homepage</A> besuchen", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Lizenz anzeigen...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index 51b0efe82a..e367bddd5c 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -6,16 +6,16 @@ CAPTION "Γενικά" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Σύστημα:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Έκδοση", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Υπολογιστής:", IDC_STATIC, 124, 132, 44, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "Σύστημα:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Έκδοση", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Υπολογιστής:", IDC_STATIC, 124, 116, 44, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Επισκευτείτε την <A HREF=""http://www.reactos.org/"">Ιστοσελίδα του ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Προβολή άδειας...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index 6d370b680e..a093177b44 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -6,16 +6,16 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "System:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Machine:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "System:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Visit the <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "View &license...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index ca270ee489..ada415ebb7 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -8,16 +8,16 @@ CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Sistema operativo:", IDC_STATIC, 4, 132, 80, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versión", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Equipo:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "Sistema operativo:", IDC_STATIC, 4, 116, 80, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Versión", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Equipo:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Visite la <A HREF=""http://www.reactos.org/"">página Web de ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Ver &licencia...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index 6d53f2501a..f1cee0c1e2 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -6,16 +6,16 @@ CAPTION "Général" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Système d'exploitation :", IDC_STATIC, 4, 132, 75, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Machine:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "Système d'exploitation :", IDC_STATIC, 4, 116, 75, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Visiter la <A HREF=""http://www.reactos.org/"">page d'accueil ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Voir la &licence...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index eac11eebbc..2538a4c2ed 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -8,16 +8,16 @@ CAPTION "כללי" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "מערכת:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "גרסה", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "מכונה:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "מערכת:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "גרסה", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "מכונה:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "בקר את <A HREF=""http://www.reactos.org/"">דף הבית של ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "ראה רישיון...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index 741a80114e..75c71af7ee 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -8,16 +8,16 @@ CAPTION "Általános" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Operációs rendszer:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Verzió", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Számítógép:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "Operációs rendszer:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Verzió", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Számítógép:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Visit the <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index 33736de38d..c65790438a 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -6,16 +6,16 @@ CAPTION "Umum" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Sistem:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versi", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Mesin:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "Sistem:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Versi", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Mesin:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Kunjungi <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Lihat &lisensi...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index 4bb1b151b6..569eace1e4 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -6,16 +6,16 @@ CAPTION "Generale" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Sistema:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versione", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Macchina:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "Sistema:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Versione", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Macchina:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Visita <A HREF=""http://www.reactos.org/"">ReactOS su internet</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Vedi la licenza...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index 61ec5a5c63..2488700565 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -6,16 +6,16 @@ CAPTION "全般" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "システム:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "マシン:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "システム:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "マシン:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "<A HREF=""http://www.reactos.org/"">ReactOS ホームページ</A>へ行く", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "ライセンスを表示(&L)...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index 26d89c4388..dbeceebb84 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -6,16 +6,16 @@ CAPTION "Algemeen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Besturingssysteem:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versie", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Machine:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "Besturingssysteem:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Versie", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Machine:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Visit the <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index b0bebeba0e..debeb1e473 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -6,16 +6,16 @@ CAPTION "Generielt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "System:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versjon", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Maskin:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "System:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Versjon", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Maskin:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Besøk <A HREF=""http://www.reactos.org/no/index.html"">ReactOS Hjemmesiden</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Vis &lisensen...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index ffc2281821..dc1fb2c1fa 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -15,16 +15,16 @@ CAPTION "Ogólne" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "System:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Wersja", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Komputer:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "System:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Wersja", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Komputer:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Odwiedź <A HREF=""http://www.reactos.org/"">Stronę domową ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Wyświetl &licencję...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index 9f47c192d8..c455022c2e 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -15,16 +15,16 @@ CAPTION "Generale" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Sistem:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 + LTEXT "Sistem:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 LTEXT "Versiune", IDC_STATIC, 10, 153, 30, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Calculator:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Calculator:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Vizitați<A HREF=""http://www.reactos.org/""> pagina web ReactOS </A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Licență…", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 81177b8455..1ec7735330 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -6,16 +6,16 @@ CAPTION "Общие" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Операционная система:", IDC_STATIC, 4, 132, 87, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Версия", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Компьютер:", IDC_STATIC, 124, 132, 40, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "Операционная система:", IDC_STATIC, 4, 116, 87, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Версия", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Компьютер:", IDC_STATIC, 124, 116, 40, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Посетите <A HREF=""http://www.reactos.org/"">домашнюю страницу ReactOS</A>.", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Лицензия...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index ea264360ec..b0a46ea8ef 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -14,16 +14,16 @@ CAPTION "Všeobecné" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Systém:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Verzia", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Počítač:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "Systém:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Verzia", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Počítač:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Navštívte <A HREF=""http://www.reactos.org/"">domovskú stránku systému ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Zobraziť &licenciu...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index 5ef8d66091..ad656c358b 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -6,16 +6,16 @@ CAPTION "Përgjithshëm" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Sistemi:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versioni", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Makinë:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "Sistemi:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Versioni", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Makinë:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Vizitoni <A HREF=""http://www.reactos.org/"">Faqeb ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Shiko &licencës...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index 774d481f67..781e0a8455 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -8,16 +8,16 @@ CAPTION "Allmänt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Operativsystem:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Dator:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "Operativsystem:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Dator:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Besök <A HREF=""http://www.reactos.org/"">ReactOS hemsida</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "Visa &licens...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index 37bad27b59..b3fb58dabc 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -8,16 +8,16 @@ CAPTION "Umûmî" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Dizge:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Sürüm:", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "Makine:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "Dizge:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Sürüm:", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "Makine:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "<A HREF=""http://www.reactos.org/"">ReactOS Ana Sayfa</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Ruhsatı Göster...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index 178deaa3c7..6cb865437d 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -14,16 +14,16 @@ CAPTION "Загальні" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "Операційна система:", IDC_STATIC, 4, 132, 82, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Версія", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 + LTEXT "Операційна система:", IDC_STATIC, 4, 116, 82, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "Версія", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 LTEXT "Комп'ютер:", IDC_STATIC, 124, 132, 36, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "Відвідаєте <A HREF=""http://www.reactos.org/"">домашню сторінку ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "&Ліцензія...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index d475e4dca5..e68aef5599 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -9,16 +9,16 @@ CAPTION "常规" FONT 9, "宋体", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "系统:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "版本", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "计算机:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "系统:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "版本", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "计算机:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "访问<A HREF=""http://www.reactos.org/"">ReactOS 主页</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "许可证(&L)...", IDC_LICENCE, 170, 198, 78, 15 END diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index e9481a16e1..ad1264fe3c 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -8,16 +8,16 @@ CAPTION "常規" FONT 9, "新細明體", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 - LTEXT "系統:", IDC_STATIC, 4, 132, 32, 9 - LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "版本", IDC_ROSVERSION, 10, 153, 116, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 - LTEXT "計算機:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 - LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 - LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 - LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 - LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + LTEXT "系統:", IDC_STATIC, 4, 116, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 128, 116, 9 + LTEXT "版本", IDC_ROSVERSION, 10, 137, 116, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 146, 110, 9 + LTEXT "計算機:", IDC_STATIC, 124, 116, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 128, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 137, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 146, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 155, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 164, 118, 9 CONTROL "請訪問<A HREF=""http://www.reactos.org/"">ReactOS 主頁</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 PUSHBUTTON "查看版權信息(&L)...", IDC_LICENCE, 170, 198, 78, 15 END

1 0

02/05: [UDMIHELP] Initialize output buffer if DMI string is NULL
by Stanislav Motylkov 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bae6e075e0412d0a32769… commit bae6e075e0412d0a32769aad6041c48bcf60b517 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Aug 15 20:43:01 2018 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Sep 29 17:11:08 2018 +0300 [UDMIHELP] Initialize output buffer if DMI string is NULL --- sdk/lib/udmihelp/udmihelp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sdk/lib/udmihelp/udmihelp.c b/sdk/lib/udmihelp/udmihelp.c index a7070eb33d..4b9695c4f2 100644 --- a/sdk/lib/udmihelp/udmihelp.c +++ b/sdk/lib/udmihelp/udmihelp.c @@ -151,7 +151,13 @@ GetSMBiosStringW( SIZE_T cChars; if (!DmiString) + { + if (cchBuf >= 1) + { + *pBuf = 0; + } return 0; + } cChars = MultiByteToWideChar(CP_OEMCP, 0, DmiString, -1, pBuf, cchBuf);

1 0

01/05: [DMILIB] Process SKU and Family strings
by Stanislav Motylkov 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3568045502799c90da5f… commit c3568045502799c90da5f258e4d31c99995cc347 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Sep 27 22:02:17 2018 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Sep 29 17:10:48 2018 +0300 [DMILIB] Process SKU and Family strings --- sdk/lib/dmilib/dmi.h | 2 ++ sdk/lib/dmilib/dmilib.c | 2 ++ sdk/lib/dmilib/dmilib.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sdk/lib/dmilib/dmi.h b/sdk/lib/dmilib/dmi.h index 855b69703e..07dfc5dd0f 100644 --- a/sdk/lib/dmilib/dmi.h +++ b/sdk/lib/dmilib/dmi.h @@ -87,6 +87,8 @@ enum _DMI_FIELD_OFFSETS DMI_SYS_PRODUCT = 0x05, DMI_SYS_VERSION = 0x06, DMI_SYS_SERIAL = 0x07, + DMI_SYS_SKU = 0x19, + DMI_SYS_FAMILY = 0x1a, DMI_SYS_SIZE = 0x1b, /* Type = 2: DMI_ENTRY_BASEBOARD */ diff --git a/sdk/lib/dmilib/dmilib.c b/sdk/lib/dmilib/dmilib.c index 7571fcaf71..e7469befc5 100644 --- a/sdk/lib/dmilib/dmilib.c +++ b/sdk/lib/dmilib/dmilib.c @@ -73,6 +73,8 @@ ParseSMBiosTables( Strings[SYS_PRODUCT] = GetDmiString(Header, DMI_SYS_PRODUCT); Strings[SYS_VERSION] = GetDmiString(Header, DMI_SYS_VERSION); Strings[SYS_SERIAL] = GetDmiString(Header, DMI_SYS_SERIAL); + Strings[SYS_SKU] = GetDmiString(Header, DMI_SYS_SKU); + Strings[SYS_FAMILY] = GetDmiString(Header, DMI_SYS_FAMILY); break; case DMI_ENTRY_BASEBOARD: diff --git a/sdk/lib/dmilib/dmilib.h b/sdk/lib/dmilib/dmilib.h index 22f2331725..9bfcf5f507 100644 --- a/sdk/lib/dmilib/dmilib.h +++ b/sdk/lib/dmilib/dmilib.h @@ -18,6 +18,8 @@ enum _ID_STRINGS SYS_PRODUCT, SYS_VERSION, SYS_SERIAL, + SYS_SKU, + SYS_FAMILY, BOARD_VENDOR, BOARD_NAME, BOARD_VERSION,

1 0

01/01: [MSPORTS] Implement the 'Filter Resource Method' setting for parallel ports
by Eric Kohl 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=133611fed8d99cf0de81e… commit 133611fed8d99cf0de81eb1532008894973a4e09 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Sep 29 14:58:55 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Sep 29 14:58:55 2018 +0200 [MSPORTS] Implement the 'Filter Resource Method' setting for parallel ports --- dll/win32/msports/parallel.c | 235 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 230 insertions(+), 5 deletions(-) diff --git a/dll/win32/msports/parallel.c b/dll/win32/msports/parallel.c index 864c22576b..e50d358ac7 100644 --- a/dll/win32/msports/parallel.c +++ b/dll/win32/msports/parallel.c @@ -8,17 +8,222 @@ #include "precomp.h" +typedef struct _PORT_DATA +{ + HDEVINFO DeviceInfoSet; + PSP_DEVINFO_DATA DeviceInfoData; + + WCHAR szPortName[16]; + DWORD dwFilterResourceMethod; +} PORT_DATA, *PPORT_DATA; + + +static +VOID +ReadPortSettings( + PPORT_DATA pPortData) +{ + DWORD dwSize; + HKEY hKey; + LONG lError; + + TRACE("ReadPortSettings(%p)\n", pPortData); + + pPortData->dwFilterResourceMethod = 1; /* Never use an interrupt */ + + hKey = SetupDiOpenDevRegKey(pPortData->DeviceInfoSet, + pPortData->DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DEV, + KEY_READ); + if (hKey == INVALID_HANDLE_VALUE) + { + ERR("SetupDiOpenDevRegKey() failed\n"); + return; + } + + dwSize = sizeof(pPortData->szPortName); + lError = RegQueryValueExW(hKey, + L"PortName", + NULL, + NULL, + (PBYTE)pPortData->szPortName, + &dwSize); + if (lError != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed (Error %lu)\n", lError); + } + + dwSize = sizeof(pPortData->dwFilterResourceMethod); + lError = RegQueryValueExW(hKey, + L"FilterResourceMethod", + NULL, + NULL, + (PBYTE)&pPortData->dwFilterResourceMethod, + &dwSize); + if (lError != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed (Error %lu)\n", lError); + } + + RegCloseKey(hKey); +} + + +static +VOID +WritePortSettings( + HWND hwnd, + PPORT_DATA pPortData) +{ + DWORD dwFilterResourceMethod; + HKEY hKey; + LONG lError; + + TRACE("WritePortSettings(%p)\n", pPortData); + + dwFilterResourceMethod = 1; + if (Button_GetCheck(GetDlgItem(hwnd, IDC_TRY_INTERRUPT)) == BST_CHECKED) + dwFilterResourceMethod = 0; + else if (Button_GetCheck(GetDlgItem(hwnd, IDC_NEVER_INTERRUPT)) == BST_CHECKED) + dwFilterResourceMethod = 1; + else if (Button_GetCheck(GetDlgItem(hwnd, IDC_ANY_INTERRUPT)) == BST_CHECKED) + dwFilterResourceMethod = 2; + + if (dwFilterResourceMethod != pPortData->dwFilterResourceMethod) + { + hKey = SetupDiOpenDevRegKey(pPortData->DeviceInfoSet, + pPortData->DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DEV, + KEY_WRITE); + if (hKey == INVALID_HANDLE_VALUE) + { + ERR("SetupDiOpenDevRegKey() failed\n"); + return; + } + + lError = RegSetValueExW(hKey, + L"FilterResourceMethod", + 0, + REG_DWORD, + (PBYTE)&dwFilterResourceMethod, + sizeof(dwFilterResourceMethod)); + if (lError != ERROR_SUCCESS) + { + ERR("RegSetValueExW failed (Error %lu)\n", lError); + } + + RegCloseKey(hKey); + + pPortData->dwFilterResourceMethod = dwFilterResourceMethod; + } + +} + + static BOOL OnInitDialog(HWND hwnd, WPARAM wParam, LPARAM lParam) { - TRACE("Port_OnInit()\n"); + PPORT_DATA pPortData; + HWND hwndControl; + WCHAR szBuffer[256]; + UINT i; + + TRACE("OnInitDialog()\n"); + + pPortData = (PPORT_DATA)((LPPROPSHEETPAGEW)lParam)->lParam; + if (pPortData == NULL) + { + ERR("pPortData is NULL\n"); + return FALSE; + } + + SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)pPortData); + + /* Read and parse the port settings */ + ReadPortSettings(pPortData); + + /* Set the 'Filter Resource Method' radiobuttons */ + hwndControl = GetDlgItem(hwnd, + IDC_TRY_INTERRUPT + pPortData->dwFilterResourceMethod); + if (hwndControl) + Button_SetCheck(hwndControl, BST_CHECKED); + + /* Disable the 'Enable legacy PNP detection' checkbox */ + hwndControl = GetDlgItem(hwnd, IDC_PARALLEL_LEGACY); + EnableWindow(hwndControl, FALSE); + + /* Fill the 'LPT Port Number' combobox */ + hwndControl = GetDlgItem(hwnd, IDC_PARALLEL_NAME); + if (hwndControl) + { + for (i = 0; i < 3; i++) + { + swprintf(szBuffer, L"LPT%lu", i + 1); + ComboBox_AddString(hwndControl, szBuffer); + } + + /* Disable it */ + EnableWindow(hwndControl, FALSE); + } + return TRUE; } +static +VOID +OnNotify( + HWND hwnd, + WPARAM wParam, + LPARAM lParam) +{ + PPORT_DATA pPortData; + + TRACE("OnNotify()\n"); + + pPortData = (PPORT_DATA)GetWindowLongPtr(hwnd, DWLP_USER); + if (pPortData == NULL) + { + ERR("pPortData is NULL\n"); + return; + } + + if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) + { + TRACE("PSN_APPLY!\n"); + WritePortSettings(hwnd, pPortData); + } +} + + +static +VOID +OnDestroy( + HWND hwnd) +{ + PPORT_DATA pPortData; + + TRACE("OnDestroy()\n"); + + pPortData = (PPORT_DATA)GetWindowLongPtr(hwnd, DWLP_USER); + if (pPortData == NULL) + { + ERR("pPortData is NULL\n"); + return; + } + + HeapFree(GetProcessHeap(), 0, pPortData); + SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)NULL); +} + + static INT_PTR CALLBACK @@ -32,8 +237,15 @@ ParallelSettingsDlgProc(HWND hwnd, switch (uMsg) { case WM_INITDIALOG: - SendDlgItemMessage(hwnd, IDC_NEVER_INTERRUPT, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); return OnInitDialog(hwnd, wParam, lParam); + + case WM_NOTIFY: + OnNotify(hwnd, wParam, lParam); + break; + + case WM_DESTROY: + OnDestroy(hwnd); + break; } return FALSE; @@ -48,10 +260,23 @@ ParallelPortPropPageProvider(PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, { PROPSHEETPAGEW PropSheetPage; HPROPSHEETPAGE hPropSheetPage; + PPORT_DATA pPortData; TRACE("ParallelPortPropPageProvider(%p %p %lx)\n", lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); + pPortData = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(PORT_DATA)); + if (pPortData == NULL) + { + ERR("Port data allocation failed!\n"); + return FALSE; + } + + pPortData->DeviceInfoSet = lpPropSheetPageRequest->DeviceInfoSet; + pPortData->DeviceInfoData = lpPropSheetPageRequest->DeviceInfoData; + if (lpPropSheetPageRequest->PageRequested == SPPSR_ENUM_ADV_DEVICE_PROPERTIES) { TRACE("SPPSR_ENUM_ADV_DEVICE_PROPERTIES\n"); @@ -61,19 +286,19 @@ ParallelPortPropPageProvider(PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, PropSheetPage.hInstance = hInstance; PropSheetPage.pszTemplate = MAKEINTRESOURCE(IDD_PARALLELSETTINGS); PropSheetPage.pfnDlgProc = ParallelSettingsDlgProc; - PropSheetPage.lParam = 0; + PropSheetPage.lParam = (LPARAM)pPortData; PropSheetPage.pfnCallback = NULL; hPropSheetPage = CreatePropertySheetPageW(&PropSheetPage); if (hPropSheetPage == NULL) { - TRACE("CreatePropertySheetPageW() failed!\n"); + ERR("CreatePropertySheetPageW() failed!\n"); return FALSE; } if (!(*lpfnAddPropSheetPageProc)(hPropSheetPage, lParam)) { - TRACE("lpfnAddPropSheetPageProc() failed!\n"); + ERR("lpfnAddPropSheetPageProc() failed!\n"); DestroyPropertySheetPage(hPropSheetPage); return FALSE; }

1 0

01/01: [DEVCPUX] Add French translation
by Pierre Schweitzer 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f85e4fe9f7c43db0ffe0… commit 1f85e4fe9f7c43db0ffe0a257599bd4100c8737b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 29 11:36:45 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 29 11:36:45 2018 +0200 [DEVCPUX] Add French translation --- dll/shellext/devcpux/lang/fr-FR.rc | 41 ++++++++++++++++++++++++++++++++++++++ dll/shellext/devcpux/processor.rc | 3 +++ 2 files changed, 44 insertions(+) diff --git a/dll/shellext/devcpux/lang/fr-FR.rc b/dll/shellext/devcpux/lang/fr-FR.rc new file mode 100644 index 0000000000..c2b565e694 --- /dev/null +++ b/dll/shellext/devcpux/lang/fr-FR.rc @@ -0,0 +1,41 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "Processeur" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Fonctionnalités :", -1, 7, 23, 50, 8 + LTEXT "test", IDC_FEATURES, 57, 23, 181, 8 + LTEXT "Modèle :", -1, 7, 38, 50, 8 + LTEXT "test", IDC_MODEL, 57, 38, 181, 8 + LTEXT "Révision :", -1, 7, 53, 50, 51 + LTEXT "test", IDC_STEPPING, 57, 53, 181, 8 + LTEXT "Fréquence :", -1, 7, 68, 50, 8 + LTEXT "test", IDC_CORESPEED, 57, 68, 181, 8 +END + +STRINGTABLE +BEGIN + IDS_MEGAHERTZ "%ld MHz" +END + +/* +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "CPU" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Features:", -1, 7, 23, 50, 8 + LTEXT "<test>", IDC_FEATURES, 7, 34, 238, 8 + + LTEXT "Model:", -1, 7, 49, 50, 8 + LTEXT "<test>", IDC_MODEL, 7, 60, 238, 8 + + LTEXT "Stepping:", -1, 7, 75, 50, 8 + LTEXT "<test>", IDC_STEPPING, 7, 86, 238, 8 + + LTEXT "Core Speed:", -1, 7, 101, 50, 8 + LTEXT "<test>", IDC_CORESPEED, 7, 112, 238, 8 +END +*/ diff --git a/dll/shellext/devcpux/processor.rc b/dll/shellext/devcpux/processor.rc index 0771485902..3ee900eb9d 100644 --- a/dll/shellext/devcpux/processor.rc +++ b/dll/shellext/devcpux/processor.rc @@ -15,6 +15,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif

1 0

01/01: [NTOSKRNL] Reference the file object before issuing the unlock all IRP
by Pierre Schweitzer 29 Sep '18

29 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=207ff9444e946e3736f34… commit 207ff9444e946e3736f34ef6eaf32ab065cf8ca9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 29 11:21:19 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 29 11:22:22 2018 +0200 [NTOSKRNL] Reference the file object before issuing the unlock all IRP This fixes the last kmode assert triggered by httpd on ReactOS. CORE-12045 --- ntoskrnl/io/iomgr/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index 8e3b626cdf..e7633a331f 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -1985,6 +1985,7 @@ IopCloseFile(IN PEPROCESS Process OPTIONAL, Irp->RequestorMode = KernelMode; Irp->Flags = IRP_SYNCHRONOUS_API; Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + ObReferenceObject(FileObject); /* Set up Stack Pointer Data */ StackPtr = IoGetNextIrpStackLocation(Irp);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs