Ros-diffs November 2020

ros-diffs@reactos.org

18 participants
162 discussions

[reactos] 01/01: [SHELL32] Hide "This version of ReactOS is registered to:" text on condition (#3325)
by Riley Bell 30 Nov '20

30 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30144179190c11519add8… commit 30144179190c11519add8c1f4fe13afed52cb997 Author: Riley Bell <rileyjb9(a)gmail.com> AuthorDate: Tue Oct 27 05:02:35 2020 -0700 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Nov 30 03:12:32 2020 +0300 [SHELL32] Hide "This version of ReactOS is registered to:" text on condition (#3325) When the system is not installed yet (e.g. LiveCD or 2nd installation stage) there is no registered user and organization, so no need to show this text label in the shell about dialog. Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/win32/shell32/lang/bg-BG.rc | 2 +- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/cs-CZ.rc | 2 +- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/de-DE.rc | 2 +- dll/win32/shell32/lang/el-GR.rc | 2 +- dll/win32/shell32/lang/en-GB.rc | 2 +- dll/win32/shell32/lang/en-US.rc | 2 +- dll/win32/shell32/lang/es-ES.rc | 2 +- dll/win32/shell32/lang/et-EE.rc | 2 +- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/fr-FR.rc | 2 +- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/hi-IN.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 2 +- dll/win32/shell32/lang/id-ID.rc | 2 +- dll/win32/shell32/lang/it-IT.rc | 2 +- dll/win32/shell32/lang/ja-JP.rc | 2 +- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/no-NO.rc | 2 +- dll/win32/shell32/lang/pl-PL.rc | 2 +- dll/win32/shell32/lang/pt-BR.rc | 2 +- dll/win32/shell32/lang/pt-PT.rc | 2 +- dll/win32/shell32/lang/ro-RO.rc | 2 +- dll/win32/shell32/lang/ru-RU.rc | 2 +- dll/win32/shell32/lang/sk-SK.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- dll/win32/shell32/lang/sq-AL.rc | 2 +- dll/win32/shell32/lang/sv-SE.rc | 2 +- dll/win32/shell32/lang/tr-TR.rc | 2 +- dll/win32/shell32/lang/uk-UA.rc | 2 +- dll/win32/shell32/lang/zh-CN.rc | 2 +- dll/win32/shell32/lang/zh-TW.rc | 2 +- dll/win32/shell32/shresdef.h | 1 + dll/win32/shell32/wine/shell32_main.c | 7 +++++++ 36 files changed, 42 insertions(+), 34 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index a4189880a22..ee4d85bd4d7 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -141,7 +141,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Тази версия на РеактОС е записана на:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Тази версия на РеактОС е записана на:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index c4a7f66b1ce..0efaba8e9fc 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "This ReactOS version is registered to:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 4776320d3c0..bd35687c51d 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -146,7 +146,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Tato verze ReactOS je zaregistrována na:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Tato verze ReactOS je zaregistrována na:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 18825835a7f..6a62e89fc92 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -146,7 +146,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "This ReactOS version is registered to:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 841973d5b28..a88cb99ddc4 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Das ReactOS Team\0", IDC_STATIC, 105, 75, 70, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Diese ReactOS-Version wurde registriert auf:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Diese ReactOS-Version wurde registriert auf:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 4513166c9a9..8717da29146 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Αυτή η έκδοση του ReactOS είναι καταχωρημένη στον :", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Αυτή η έκδοση του ReactOS είναι καταχωρημένη στον :", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 576daf044ab..f14f2006474 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "This ReactOS version is registered to:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index ddcedb8b2ea..0dbe4c0b75a 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "This ReactOS version is registered to:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index acef0a2aa29..bd497687819 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -149,7 +149,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " El equipo de ReactOS\0", IDC_STATIC, 105, 75, 100, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Esta versión de ReactOS está registrada a nombre de:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Esta versión de ReactOS está registrada a nombre de:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 1f9497e51b4..93bb2e9d8b8 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -147,7 +147,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "See ReactOS versioon on registreeritud üksusele:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "See ReactOS versioon on registreeritud üksusele:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 322457ad802..007a086d95e 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "This ReactOS version is registered to:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 108872f06d8..6a95cfd000e 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Cette version de ReactOS est enregistrée à :", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Cette version de ReactOS est enregistrée à :", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 669b3e827c8..628830d04eb 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -142,7 +142,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " צוות ReactOS\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "גירסה זו של ReactOS רשומה עבור:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "גירסה זו של ReactOS רשומה עבור:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 79ee61403d2..c13f2730c19 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " रिऐक्ट ओएस टीम\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "यह रिऐक्ट ओएस वर्ज़न पंजीकृत है:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "यह रिऐक्ट ओएस वर्ज़न पंजीकृत है:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index dfd77d701be..5f6c86a7e0f 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "A ReactOS ezen verziója az alábbi névre van regisztrálva:", IDC_STATIC, 35, 115, 200, 10 + LTEXT "A ReactOS ezen verziója az alábbi névre van regisztrálva:", IDC_ABOUT_REG_TO, 35, 115, 200, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index d8506fbe52c..b89c71a6b4b 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Tim ReactOS\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Versi ReactOS ini terdaftar kepada:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Versi ReactOS ini terdaftar kepada:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 3a537c8a81d..c442b3c82bf 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Questa versione di ReactOS è registrata a nome di:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Questa versione di ReactOS è registrata a nome di:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index a0ca7140350..8a3997f3d12 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "この ReactOS のバージョンは次の方に登録されています:", IDC_STATIC, 35, 105, 180, 10 + LTEXT "この ReactOS のバージョンは次の方に登録されています:", IDC_ABOUT_REG_TO, 35, 105, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 125, 180, 10 LTEXT "", IDC_STATIC, 35, 125, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 2fc91428a2d..139a5226fe8 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "This ReactOS version is registered to:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 9e1434b5f06..f598cfef746 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "This ReactOS version is registered to:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 07dd8b29350..4058056a405 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Denne ReactOS versjonen er registert til:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Denne ReactOS versjonen er registert til:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 0f900b4163f..f2421fd7a1b 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -146,7 +146,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Ta kopia systemu ReactOS jest zarejestrowana na:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Ta kopia systemu ReactOS jest zarejestrowana na:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 36af8175910..d128f0eda74 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Esta versão do ReactOS está registrado para:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Esta versão do ReactOS está registrado para:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 5f6df026596..b09f19dd217 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Esta versão do ReactOS é registada a:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Esta versão do ReactOS é registada a:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 3b3e965ffce..d1fca5dd7d2 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -142,7 +142,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 103, 75, 17, 10 LTEXT " Echipa ReactOS\0", IDC_STATIC, 120, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Versiune înregistrată pentru:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Versiune înregistrată pentru:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 2983cf2e9d3..a56cc801e23 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -147,7 +147,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Команда ReactOS\0", IDC_STATIC, 105, 75, 65, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Данная версия ReactOS зарегистрирована на:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Данная версия ReactOS зарегистрирована на:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 02ec1c7f2d4..1174b80aaa8 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Táto verzia systému ReactOS je registrovaná pre:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Táto verzia systému ReactOS je registrovaná pre:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 0e7e5215a94..9d612c7b886 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "This ReactOS version is registered to:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 22f4fd02397..1e17a5b072f 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -144,7 +144,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Ekipi ReactOS\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Ky version ReactOS është i regjistruar për:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Ky version ReactOS është i regjistruar për:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index e4c7d0192ea..4a4498c32d4 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS-gruppen\0", IDC_STATIC, 105, 75, 60, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Den här versionen av ReactOS är registrerad till:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Den här versionen av ReactOS är registrerad till:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index cf7bb2e7111..ffb79b82628 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -142,7 +142,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Takımı\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Bu ReactOS sürümü şuna kayıtlıdır:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Bu ReactOS sürümü şuna kayıtlıdır:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index e1ff4ace012..d96037feef1 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Ця версія ReactOS зареєстрована на:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Ця версія ReactOS зареєстрована на:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index da607ce1762..853eb50f76d 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -150,7 +150,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "这个 ReactOS 版本注册到:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "这个 ReactOS 版本注册到:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 33dcb7ff313..4d5fd292a0b 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -150,7 +150,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "此版本授權予:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "此版本授權予:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 821d4d05a85..d2de59071fe 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -325,6 +325,7 @@ #define IDS_ABOUT_VERSION_STRING 0x3501 #define IDC_ABOUT_VERSION 0x3502 #define IDC_ABOUT_OTHERSTUFF 0x350D +#define IDC_ABOUT_REG_TO 0x3506 #define IDC_ABOUT_REG_USERNAME 0x3507 #define IDC_ABOUT_REG_ORGNAME 0x3508 #define IDC_ABOUT_PHYSMEM 0x3503 diff --git a/dll/win32/shell32/wine/shell32_main.c b/dll/win32/shell32/wine/shell32_main.c index fdd02477b2a..a89999c4774 100644 --- a/dll/win32/shell32/wine/shell32_main.c +++ b/dll/win32/shell32/wine/shell32_main.c @@ -1192,6 +1192,13 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM { SetRegTextData( hWnd, hRegKey, L"RegisteredOwner", IDC_ABOUT_REG_USERNAME ); SetRegTextData( hWnd, hRegKey, L"RegisteredOrganization", IDC_ABOUT_REG_ORGNAME ); +#ifdef __REACTOS__ + if(GetWindowTextLengthW( GetDlgItem( hWnd, IDC_ABOUT_REG_USERNAME ) ) == 0 && + GetWindowTextLengthW( GetDlgItem( hWnd, IDC_ABOUT_REG_ORGNAME ) ) == 0) + { + ShowWindow( GetDlgItem( hWnd, IDC_ABOUT_REG_TO ), SW_HIDE ); + } +#endif RegCloseKey( hRegKey ); }

1 0

[reactos] 01/01: [MSGINA] Improve exports for all stubbed functions (#3256)
by Oleg Dubinskiy 28 Nov '20

28 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6bf7f83b2ad2a4fff109c… commit 6bf7f83b2ad2a4fff109cdbf1d21d37764b64a7b Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sat Nov 28 16:32:53 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 28 17:32:53 2020 +0300 [MSGINA] Improve exports for all stubbed functions (#3256) Since they are completely undocumented and unlikely will be implemented in ROS, stubbing them only in spec file seems to be a better solution than adding wrong prototypes. Use `stdcall -stub` instead of `stub` and enable parameters of the functions. This allows to properly load our msgina.dll in Windows XP/2003. Although it still doesn't boot to desktop with dll replaced, but nevertheless the system crash that was caused by stubbed functions does no longer happen. --- dll/win32/msgina/msgina.spec | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dll/win32/msgina/msgina.spec b/dll/win32/msgina/msgina.spec index 53de1e66eaf..44c2181d3e8 100644 --- a/dll/win32/msgina/msgina.spec +++ b/dll/win32/msgina/msgina.spec @@ -1,31 +1,31 @@ -1 stub -noname ShellGetUserList ; (long long long) -2 stub -noname ShellStatusHostEnd ; (long) +1 stdcall -stub -noname ShellGetUserList(long long long) +2 stdcall -stub -noname ShellStatusHostEnd(long) 3 stdcall -noname ShellIsFriendlyUIActive() -4 stub -noname ShellIsSuspendAllowed ; () -5 stub -noname ShellIsRemoteConnectionsEnabled ; () -6 stub -noname ShellEnableFriendlyUI ; (long) -7 stub -noname ShellEnableMultipleUsers ; (long) -8 stub -noname ShellEnableRemoteConnections ; (long) +4 stdcall -stub -noname ShellIsSuspendAllowed() +5 stdcall -stub -noname ShellIsRemoteConnectionsEnabled() +6 stdcall -stub -noname ShellEnableFriendlyUI(long) +7 stdcall -stub -noname ShellEnableMultipleUsers(long) +8 stdcall -stub -noname ShellEnableRemoteConnections(long) 9 stdcall -noname ShellTurnOffDialog(ptr) -10 stub -noname ShellIsMultipleUsersEnabled ; () -11 stub -noname ShellACPIPowerButtonPressed ; (long long long) -12 stub -noname ShellIsSingleUserNoPassword ; (wstr wstr) -13 stub -noname ShellStatusHostShuttingDown ; () -14 stub -noname ShellNotifyThemeUserChange ; (long long) -15 stub -noname ShellSwitchWhenInteractiveReady ; (long long) +10 stdcall -stub -noname ShellIsMultipleUsersEnabled() +11 stdcall -stub -noname ShellACPIPowerButtonPressed(long long long) +12 stdcall -stub -noname ShellIsSingleUserNoPassword(wstr wstr) +13 stdcall -stub -noname ShellStatusHostShuttingDown() +14 stdcall -stub -noname ShellNotifyThemeUserChange(long long) +15 stdcall -stub -noname ShellSwitchWhenInteractiveReady(long long) 16 stdcall -noname ShellDimScreen(ptr ptr) -17 stub -noname ShellInstallAccountFilterData ; () -18 stub -noname ShellStatusHostBegin ; (long) -19 stub -noname ShellIsUserInteractiveLogonAllowed ; (long) -20 stub -noname ShellSwitchUser ; (long) -21 stub -noname ShellReturnToWelcome ; (long) -22 stub -noname ShellStatusHostPowerEvent ; () -23 stub -noname ShellStartCredentialServer ; (wstr long long long) -24 stub -noname ShellAcquireLogonMutex ; () -25 stub -noname ShellReleaseLogonMutex ; (long) -26 stub -noname ShellSignalShutdown ; () -27 stub -noname ShellStatusHostHide ; () -28 stub -noname ShellStatusHostShow ; () +17 stdcall -stub -noname ShellInstallAccountFilterData() +18 stdcall -stub -noname ShellStatusHostBegin(long) +19 stdcall -stub -noname ShellIsUserInteractiveLogonAllowed(long) +20 stdcall -stub -noname ShellSwitchUser(long) +21 stdcall -stub -noname ShellReturnToWelcome(long) +22 stdcall -stub -noname ShellStatusHostPowerEvent() +23 stdcall -stub -noname ShellStartCredentialServer(wstr long long long) +24 stdcall -stub -noname ShellAcquireLogonMutex() +25 stdcall -stub -noname ShellReleaseLogonMutex(long) +26 stdcall -stub -noname ShellSignalShutdown() +27 stdcall -stub -noname ShellStatusHostHide() +28 stdcall -stub -noname ShellStatusHostShow() @ stdcall ShellShutdownDialog(ptr wstr long) @ stdcall WlxActivateUserShell(ptr wstr wstr ptr) @ stdcall WlxDisconnectNotify(ptr) @@ -42,7 +42,7 @@ @ stdcall WlxLogoff(ptr) @ stdcall WlxNegotiate(long ptr) @ stdcall WlxNetworkProviderLoad(ptr ptr) -@ stub WlxReconnectNotify ; (long) +@ stdcall -stub WlxReconnectNotify(long) @ stdcall WlxRemoveStatusMessage(ptr) @ stdcall WlxScreenSaverNotify(ptr ptr) @ stdcall WlxShutdown(ptr long)

1 0

[reactos] 01/01: [MSGINA] Implement ShellTurnOffDialog (#3254)
by Oleg Dubinskiy 28 Nov '20

28 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0d2cd508f19219061eec… commit c0d2cd508f19219061eec20d41a5e7d4426527bc Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sat Nov 28 16:22:46 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 28 17:22:46 2020 +0300 [MSGINA] Implement ShellTurnOffDialog (#3254) Based on the following prototype: http://diendan.congdongcviet.com/threads/t13622::tim-handle-cua-cua-so-tat-… (line 32) and return ShellShutdownDialog from it with all required parameters. It allows to open the shutdown dialog properly from the Start menu with shell32.dll from Windows Server 2003 SP2 (when installing ReactOS as Workstation). CORE-17313 --- dll/win32/msgina/msgina.spec | 2 +- dll/win32/msgina/shutdown.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dll/win32/msgina/msgina.spec b/dll/win32/msgina/msgina.spec index 1d235ae5f62..53de1e66eaf 100644 --- a/dll/win32/msgina/msgina.spec +++ b/dll/win32/msgina/msgina.spec @@ -6,7 +6,7 @@ 6 stub -noname ShellEnableFriendlyUI ; (long) 7 stub -noname ShellEnableMultipleUsers ; (long) 8 stub -noname ShellEnableRemoteConnections ; (long) -9 stub -noname ShellTurnOffDialog ; (long) +9 stdcall -noname ShellTurnOffDialog(ptr) 10 stub -noname ShellIsMultipleUsersEnabled ; () 11 stub -noname ShellACPIPowerButtonPressed ; (long long long) 12 stub -noname ShellIsSingleUserNoPassword ; (wstr wstr) diff --git a/dll/win32/msgina/shutdown.c b/dll/win32/msgina/shutdown.c index bc6e97949d6..dd8591b4a7a 100644 --- a/dll/win32/msgina/shutdown.c +++ b/dll/win32/msgina/shutdown.c @@ -825,3 +825,14 @@ ShellShutdownDialog( return 0; } + +/* + * NOTES: + * - Undocumented, called from MS shell32.dll to show the turn off dialog. + * - Seems to have the same purpose as ShellShutdownDialog. + */ +DWORD WINAPI +ShellTurnOffDialog(HWND hWnd) +{ + return ShellShutdownDialog(hWnd, NULL, FALSE); +}

1 0

[reactos] 03/03: [NTOS:IO] Reduce stack usage in IopLoadServiceModule. CORE-17215
by Thomas Faber 27 Nov '20

27 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=828d5fa93e2cc98731626… commit 828d5fa93e2cc987316264c043b19b50e02d8f4d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Jun 10 08:27:27 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Nov 27 12:44:35 2020 +0100 [NTOS:IO] Reduce stack usage in IopLoadServiceModule. CORE-17215 --- ntoskrnl/io/iomgr/driver.c | 116 ++++++++++++++++++++++++++------------------- 1 file changed, 67 insertions(+), 49 deletions(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 9fd8c9b87c5..6b3949a5189 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -299,6 +299,70 @@ IopNormalizeImagePath( return STATUS_SUCCESS; } +NTSTATUS +IopQueryServiceSettings( + _In_ PUNICODE_STRING ServiceName, + _Out_ PUNICODE_STRING ServiceImagePath, + _Out_ PULONG ServiceStart) +{ + NTSTATUS Status; + RTL_QUERY_REGISTRY_TABLE QueryTable[3]; + UNICODE_STRING CCSName = RTL_CONSTANT_STRING( + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services"); + HANDLE CCSKey, ServiceKey; + + /* Open CurrentControlSet */ + Status = IopOpenRegistryKeyEx(&CCSKey, NULL, &CCSName, KEY_READ); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", + &CCSName, Status); + return Status; + } + + /* Open service key */ + Status = IopOpenRegistryKeyEx(&ServiceKey, CCSKey, ServiceName, KEY_READ); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", + ServiceName, Status); + ZwClose(CCSKey); + return Status; + } + + /* + * Get information about the service. + */ + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + + RtlInitUnicodeString(ServiceImagePath, NULL); + + QueryTable[0].Name = L"Start"; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[0].EntryContext = ServiceStart; + + QueryTable[1].Name = L"ImagePath"; + QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[1].EntryContext = ServiceImagePath; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE, + (PWSTR)ServiceKey, + QueryTable, + NULL, + NULL); + + ZwClose(ServiceKey); + ZwClose(CCSKey); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlQueryRegistryValues() failed for '%wZ' (Status %lx)\n", ServiceName, Status); + return Status; + } + + return Status; +} + /* * IopLoadServiceModule * @@ -317,11 +381,9 @@ IopLoadServiceModule( IN PUNICODE_STRING ServiceName, OUT PLDR_DATA_TABLE_ENTRY *ModuleObject) { - RTL_QUERY_REGISTRY_TABLE QueryTable[3]; ULONG ServiceStart; - UNICODE_STRING ServiceImagePath, CCSName; + UNICODE_STRING ServiceImagePath; NTSTATUS Status; - HANDLE CCSKey, ServiceKey; PVOID BaseAddress; ASSERT(ExIsResourceAcquiredExclusiveLite(&IopDriverLoadResource)); @@ -341,54 +403,10 @@ IopLoadServiceModule( } else { - /* Open CurrentControlSet */ - RtlInitUnicodeString(&CCSName, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services"); - Status = IopOpenRegistryKeyEx(&CCSKey, NULL, &CCSName, KEY_READ); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", - &CCSName, Status); - return Status; - } - - /* Open service key */ - Status = IopOpenRegistryKeyEx(&ServiceKey, CCSKey, ServiceName, KEY_READ); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", - ServiceName, Status); - ZwClose(CCSKey); - return Status; - } - - /* - * Get information about the service. - */ - RtlZeroMemory(QueryTable, sizeof(QueryTable)); - - RtlInitUnicodeString(&ServiceImagePath, NULL); - - QueryTable[0].Name = L"Start"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[0].EntryContext = &ServiceStart; - - QueryTable[1].Name = L"ImagePath"; - QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[1].EntryContext = &ServiceImagePath; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE, - (PWSTR)ServiceKey, - QueryTable, - NULL, - NULL); - - ZwClose(ServiceKey); - ZwClose(CCSKey); - + Status = IopQueryServiceSettings(ServiceName, &ServiceImagePath, &ServiceStart); if (!NT_SUCCESS(Status)) { - DPRINT1("RtlQueryRegistryValues() failed (Status %x)\n", Status); + DPRINT("IopQueryServiceSettings() failed for '%wZ' (Status %lx)\n", ServiceName, Status); return Status; } }

1 0

[reactos] 02/03: [NTOS:KD] Avoid large stack buffer in KdpPrint. CORE-17215
by Thomas Faber 27 Nov '20

27 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2858ff53ce0bb75f1058b… commit 2858ff53ce0bb75f1058b9b3ddb4139d46cb02bb Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Aug 22 21:11:26 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Nov 27 10:31:45 2020 +0100 [NTOS:KD] Avoid large stack buffer in KdpPrint. CORE-17215 --- ntoskrnl/kd64/kdprint.c | 80 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 62 insertions(+), 18 deletions(-) diff --git a/ntoskrnl/kd64/kdprint.c b/ntoskrnl/kd64/kdprint.c index 9932798fbde..a086652ddb3 100644 --- a/ntoskrnl/kd64/kdprint.c +++ b/ntoskrnl/kd64/kdprint.c @@ -13,6 +13,8 @@ #define NDEBUG #include <debug.h> +#define KD_PRINT_MAX_BYTES 512 + /* FUNCTIONS *****************************************************************/ BOOLEAN @@ -224,8 +226,8 @@ KdpPrompt( STRING PromptBuffer, ResponseBuffer; BOOLEAN Enable, Resend; PCHAR SafeResponseString; - CHAR CapturedPrompt[512]; - CHAR SafeResponseBuffer[512]; + CHAR CapturedPrompt[KD_PRINT_MAX_BYTES]; + CHAR SafeResponseBuffer[KD_PRINT_MAX_BYTES]; /* Normalize the lengths */ PromptLength = min(PromptLength, @@ -307,6 +309,50 @@ KdpPrompt( return ResponseBuffer.Length; } +static +NTSTATUS +NTAPI +KdpPrintFromUser( + _In_ ULONG ComponentId, + _In_ ULONG Level, + _In_reads_bytes_(Length) PCHAR String, + _In_ USHORT Length, + _In_ KPROCESSOR_MODE PreviousMode, + _In_ PKTRAP_FRAME TrapFrame, + _In_ PKEXCEPTION_FRAME ExceptionFrame, + _Out_ PBOOLEAN Handled) +{ + CHAR CapturedString[KD_PRINT_MAX_BYTES]; + + ASSERT(PreviousMode == UserMode); + ASSERT(Length <= sizeof(CapturedString)); + + /* Capture user-mode buffers */ + _SEH2_TRY + { + /* Probe and capture the string */ + ProbeForRead(String, Length, 1); + KdpMoveMemory(CapturedString, String, Length); + String = CapturedString; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Bad string pointer, bail out */ + _SEH2_YIELD(return STATUS_ACCESS_VIOLATION); + } + _SEH2_END; + + /* Now go through the kernel-mode code path */ + return KdpPrint(ComponentId, + Level, + String, + Length, + KernelMode, + TrapFrame, + ExceptionFrame, + Handled); +} + NTSTATUS NTAPI KdpPrint( @@ -322,7 +368,6 @@ KdpPrint( NTSTATUS Status; BOOLEAN Enable; STRING OutputString; - CHAR CapturedString[512]; if (NtQueryDebugFilterState(ComponentId, Level) == (NTSTATUS)FALSE) { @@ -335,25 +380,24 @@ KdpPrint( *Handled = FALSE; /* Normalize the length */ - Length = min(Length, sizeof(CapturedString)); + Length = min(Length, KD_PRINT_MAX_BYTES); /* Check if we need to verify the string */ if (PreviousMode != KernelMode) { - /* Capture user-mode buffers */ - _SEH2_TRY - { - /* Probe and capture the string */ - ProbeForRead(String, Length, 1); - KdpMoveMemory(CapturedString, String, Length); - String = CapturedString; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Bad string pointer, bail out */ - _SEH2_YIELD(return STATUS_ACCESS_VIOLATION); - } - _SEH2_END; + /* This case requires a 512 byte stack buffer. + * We don't want to use that much stack in the kernel case, but we + * can't use _alloca due to PSEH. So the buffer exists in this + * helper function instead. + */ + return KdpPrintFromUser(ComponentId, + Level, + String, + Length, + PreviousMode, + TrapFrame, + ExceptionFrame, + Handled); } /* Setup the output string */

1 0

[reactos] 01/03: [NTOS:PNP] Avoid recursion in IopTraverseDeviceTree(Node). CORE-17215
by Thomas Faber 27 Nov '20

27 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae1d272add25af42bd1ac… commit ae1d272add25af42bd1acd453d41407363f6658a Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Aug 17 04:05:53 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Nov 27 10:31:41 2020 +0100 [NTOS:PNP] Avoid recursion in IopTraverseDeviceTree(Node). CORE-17215 --- ntoskrnl/io/pnpmgr/devnode.c | 87 +++++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/devnode.c b/ntoskrnl/io/pnpmgr/devnode.c index 6f5e029ceff..a068cd71ddb 100644 --- a/ntoskrnl/io/pnpmgr/devnode.c +++ b/ntoskrnl/io/pnpmgr/devnode.c @@ -321,56 +321,36 @@ IopFreeDeviceNode( static NTSTATUS -IopTraverseDeviceTreeNode( +IopFindNextDeviceNodeForTraversal( _In_ PDEVICETREE_TRAVERSE_CONTEXT Context) { - PDEVICE_NODE ParentDeviceNode; - PDEVICE_NODE ChildDeviceNode; - PDEVICE_NODE NextDeviceNode; - NTSTATUS Status; - - /* Copy context data so we don't overwrite it in subsequent calls to this function */ - ParentDeviceNode = Context->DeviceNode; - - /* HACK: Keep a reference to the PDO so we can keep traversing the tree - * if the device is deleted. In a perfect world, children would have to be - * deleted before their parents, and we'd restart the traversal after - * deleting a device node. */ - ObReferenceObject(ParentDeviceNode->PhysicalDeviceObject); - - /* Call the action routine */ - Status = (Context->Action)(ParentDeviceNode, Context->Context); - if (!NT_SUCCESS(Status)) + /* If we have a child, simply go down the tree */ + if (Context->DeviceNode->Child != NULL) { - ObDereferenceObject(ParentDeviceNode->PhysicalDeviceObject); - return Status; + ASSERT(Context->DeviceNode->Child->Parent == Context->DeviceNode); + Context->DeviceNode = Context->DeviceNode->Child; + return STATUS_SUCCESS; } - /* Traversal of all children nodes */ - for (ChildDeviceNode = ParentDeviceNode->Child; - ChildDeviceNode != NULL; - ChildDeviceNode = NextDeviceNode) + while (Context->DeviceNode != Context->FirstDeviceNode) { - /* HACK: We need this reference to ensure we can get Sibling below. */ - ObReferenceObject(ChildDeviceNode->PhysicalDeviceObject); - - /* Pass the current device node to the action routine */ - Context->DeviceNode = ChildDeviceNode; - - Status = IopTraverseDeviceTreeNode(Context); - if (!NT_SUCCESS(Status)) + /* All children processed -- go sideways */ + if (Context->DeviceNode->Sibling != NULL) { - ObDereferenceObject(ChildDeviceNode->PhysicalDeviceObject); - ObDereferenceObject(ParentDeviceNode->PhysicalDeviceObject); - return Status; + ASSERT(Context->DeviceNode->Sibling->Parent == Context->DeviceNode->Parent); + Context->DeviceNode = Context->DeviceNode->Sibling; + return STATUS_SUCCESS; } - NextDeviceNode = ChildDeviceNode->Sibling; - ObDereferenceObject(ChildDeviceNode->PhysicalDeviceObject); + /* We're the last sibling -- go back up */ + ASSERT(Context->DeviceNode->Parent->LastChild == Context->DeviceNode); + Context->DeviceNode = Context->DeviceNode->Parent; + + /* We already visited the parent and all its children, so keep looking */ } - ObDereferenceObject(ParentDeviceNode->PhysicalDeviceObject); - return Status; + /* Done with all children of the start node -- stop enumeration */ + return STATUS_UNSUCCESSFUL; } NTSTATUS @@ -378,6 +358,7 @@ IopTraverseDeviceTree( _In_ PDEVICETREE_TRAVERSE_CONTEXT Context) { NTSTATUS Status; + PDEVICE_NODE DeviceNode; DPRINT("Context 0x%p\n", Context); @@ -387,8 +368,32 @@ IopTraverseDeviceTree( /* Start from the specified device node */ Context->DeviceNode = Context->FirstDeviceNode; - /* Recursively traverse the device tree */ - Status = IopTraverseDeviceTreeNode(Context); + /* Traverse the device tree */ + do + { + DeviceNode = Context->DeviceNode; + + /* HACK: Keep a reference to the PDO so we can keep traversing the tree + * if the device is deleted. In a perfect world, children would have to be + * deleted before their parents, and we'd restart the traversal after + * deleting a device node. */ + ObReferenceObject(DeviceNode->PhysicalDeviceObject); + + /* Call the action routine */ + Status = (Context->Action)(DeviceNode, Context->Context); + if (NT_SUCCESS(Status)) + { + /* Find next device node */ + ASSERT(Context->DeviceNode == DeviceNode); + Status = IopFindNextDeviceNodeForTraversal(Context); + } + + /* We need to either abort or make progress */ + ASSERT(!NT_SUCCESS(Status) || Context->DeviceNode != DeviceNode); + + ObDereferenceObject(DeviceNode->PhysicalDeviceObject); + } while (NT_SUCCESS(Status)); + if (Status == STATUS_UNSUCCESSFUL) { /* The action routine just wanted to terminate the traversal with status

1 0

[reactos] 01/01: [SMSS] Revert commit 131bc73
by Stanislav Motylkov 26 Nov '20

26 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cb9f8765b53479c09be2… commit 5cb9f8765b53479c09be25dce6e9995fadd676d8 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Nov 26 11:46:05 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Nov 26 13:06:20 2020 +0300 [SMSS] Revert commit 131bc73 This is now fixed properly by de16ef3. --- base/system/smss/pagefile.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/base/system/smss/pagefile.c b/base/system/smss/pagefile.c index 0aaed6d01ed..0e3b6746746 100644 --- a/base/system/smss/pagefile.c +++ b/base/system/smss/pagefile.c @@ -851,12 +851,8 @@ SmpCreateVolumeDescriptors(VOID) wcscpy(Buffer, L"\\??\\A:\\"); RtlInitUnicodeString(&VolumePath, Buffer); -#if defined(_M_IX86) /* Start with the C drive, except on NEC PC-98 */ StartChar = IsNEC_98 ? L'A' : L'C'; -#else - StartChar = L'C'; -#endif for (Drive = StartChar, DriveDiff = StartChar - L'A'; Drive <= L'Z'; Drive++, DriveDiff++) { /* Skip the disk if it's not in the drive map */

1 0

[reactos] 01/01: [PARTINFO] Fix GitHub MSVC (amd64) build
by Stanislav Motylkov 26 Nov '20

26 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34a634bbf65f563a81ef6… commit 34a634bbf65f563a81ef6ca527d3816349d06be8 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Nov 26 12:05:16 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Nov 26 12:22:31 2020 +0300 [PARTINFO] Fix GitHub MSVC (amd64) build Addendum to 878186b. --- modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c b/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c index e1067bcd84e..d835e5b713a 100644 --- a/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c +++ b/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c @@ -410,7 +410,7 @@ int main(int argc, char *argv[]) GUID_ELEMENTS(&LayoutBufferEx->PartitionEntry[i].Gpt.PartitionType), GUID_ELEMENTS(&LayoutBufferEx->PartitionEntry[i].Gpt.PartitionId), LayoutBufferEx->PartitionEntry[i].Gpt.Attributes, - _countof(LayoutBufferEx->PartitionEntry[i].Gpt.Name), + (int)_countof(LayoutBufferEx->PartitionEntry[i].Gpt.Name), LayoutBufferEx->PartitionEntry[i].Gpt.Name, LayoutBufferEx->PartitionEntry[i].StartingOffset.QuadPart, LayoutBufferEx->PartitionEntry[i].PartitionLength.QuadPart);

1 0

[reactos] 02/02: [ROSAPPS:PARTINFO] Implement display of IOCTL_DISK_GET_DRIVE_LAYOUT_EX info, for both MBR and GPT disks.
by Hermès Bélusca-Maïto 26 Nov '20

26 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=878186b0c5672f557437a… commit 878186b0c5672f557437a6d93412d75946c45e58 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 26 03:15:32 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 26 03:33:40 2020 +0100 [ROSAPPS:PARTINFO] Implement display of IOCTL_DISK_GET_DRIVE_LAYOUT_EX info, for both MBR and GPT disks. --- .../sysutils/utils/partinfo/partinfo.c | 299 ++++++++++++++++++--- 1 file changed, 259 insertions(+), 40 deletions(-) diff --git a/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c b/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c index 7d72e8cbacd..e1067bcd84e 100644 --- a/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c +++ b/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c @@ -1,7 +1,13 @@ /* - * partinfo - partition info program + * PROJECT: ReactOS Partition Information Tool + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Displays disk and partition information for MBR and GPT disks. + * COPYRIGHT: Copyright 2001-2002 Eric Kohl + * Copyright 2020 Hermes Belusca-Maito */ +/* INCLUDES *****************************************************************/ + #include <stdio.h> #include <stdlib.h> @@ -12,6 +18,24 @@ // #define DUMP_DATA #define DUMP_SIZE_INFO + +/* FORMATTING HELPERS *******************************************************/ + +static PCSTR PartitionStyleNames[] = {"MBR", "GPT", "RAW", "Unknown"}; +#define PARTITION_STYLE_NAME(PartStyle) \ + ( ((PartStyle) <= PARTITION_STYLE_RAW) \ + ? PartitionStyleNames[(PartStyle)] \ + : PartitionStyleNames[_countof(PartitionStyleNames)-1] ) + +#define GUID_FORMAT_STR "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x" +#define GUID_ELEMENTS(Guid) \ + (Guid)->Data1, (Guid)->Data2, (Guid)->Data3, \ + (Guid)->Data4[0], (Guid)->Data4[1], (Guid)->Data4[2], (Guid)->Data4[3], \ + (Guid)->Data4[4], (Guid)->Data4[5], (Guid)->Data4[6], (Guid)->Data4[7] + + +/* FUNCTIONS ****************************************************************/ + #ifdef DUMP_DATA void HexDump( IN PVOID buffer, @@ -54,11 +78,16 @@ int main(int argc, char *argv[]) ULONG ulDrive; HANDLE hDisk; DWORD dwRead; + DWORD dwLastError; DWORD i; SYSTEM_DEVICE_INFORMATION DeviceInfo; DISK_GEOMETRY DiskGeometry; + ULONG BufferSize; PDRIVE_LAYOUT_INFORMATION LayoutBuffer; - CHAR DriveName[40]; + PDRIVE_LAYOUT_INFORMATION_EX LayoutBufferEx; + PVOID ptr; + GUID Guid; + WCHAR DriveName[40]; if (argc != 2) { @@ -82,7 +111,7 @@ int main(int argc, char *argv[]) &i); if (!NT_SUCCESS(Status)) { - printf("NtQuerySystemInformation() failed (Status %lx)\n", Status); + printf("NtQuerySystemInformation() failed (Status 0x%lx)\n", Status); return 0; } if (DeviceInfo.NumberOfDisks == 0) @@ -93,16 +122,16 @@ int main(int argc, char *argv[]) if (ulDrive >= DeviceInfo.NumberOfDisks) { - printf("Invalid disk drive number! Valid drive numbers [0-%lu]\n", + printf("Invalid disk drive number! Valid drive numbers: [0-%lu]\n", DeviceInfo.NumberOfDisks-1); return 0; } /* Build the full drive name */ - sprintf(DriveName, "\\\\.\\PHYSICALDRIVE%lu", ulDrive); + swprintf(DriveName, L"\\\\.\\PHYSICALDRIVE%lu", ulDrive); /* Open the drive */ - hDisk = CreateFileA(DriveName, + hDisk = CreateFileW(DriveName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, @@ -111,10 +140,11 @@ int main(int argc, char *argv[]) NULL); if (hDisk == INVALID_HANDLE_VALUE) { - printf("Invalid disk handle!"); + printf("Could not open drive!"); return 0; } + /* * Get the drive geometry. */ @@ -136,8 +166,10 @@ int main(int argc, char *argv[]) #ifdef DUMP_DATA HexDump(&DiskGeometry, dwRead); #endif - printf("Drive number: %lu\n", ulDrive); - printf("Cylinders: %I64u\nMediaType: %x\nTracksPerCylinder: %lu\n" + printf("Drive number: %lu\n\n", ulDrive); + + printf("IOCTL_DISK_GET_DRIVE_GEOMETRY\n" + "Cylinders: %I64u\nMediaType: %x\nTracksPerCylinder: %lu\n" "SectorsPerTrack: %lu\nBytesPerSector: %lu\n\n", DiskGeometry.Cylinders.QuadPart, DiskGeometry.MediaType, @@ -150,58 +182,245 @@ int main(int argc, char *argv[]) // IOCTL_DISK_GET_DRIVE_GEOMETRY_EX #endif + /* * Retrieve the legacy partition layout */ - LayoutBuffer = (PDRIVE_LAYOUT_INFORMATION)malloc(8192); - if (LayoutBuffer == NULL) + + /* Allocate a layout buffer with 4 partition entries first */ + BufferSize = sizeof(DRIVE_LAYOUT_INFORMATION) + + ((4 - ANYSIZE_ARRAY) * sizeof(PARTITION_INFORMATION)); + LayoutBuffer = malloc(BufferSize); + if (!LayoutBuffer) { printf("Out of memory!"); CloseHandle(hDisk); return 0; } - memset(LayoutBuffer, 0, 8192); + memset(LayoutBuffer, 0, BufferSize); - if (!DeviceIoControl(hDisk, - IOCTL_DISK_GET_DRIVE_LAYOUT, - NULL, - 0, - LayoutBuffer, - 8192, - &dwRead, - NULL)) + /* Keep looping while the drive layout buffer is too small */ + for (;;) { - printf("DeviceIoControl(IOCTL_DISK_GET_DRIVE_LAYOUT) failed! Error: %lu\n", - GetLastError()); - CloseHandle(hDisk); + if (DeviceIoControl(hDisk, + IOCTL_DISK_GET_DRIVE_LAYOUT, + NULL, + 0, + LayoutBuffer, + BufferSize, + &dwRead, + NULL)) + { + dwLastError = ERROR_SUCCESS; + break; + } + + dwLastError = GetLastError(); + if (dwLastError != ERROR_INSUFFICIENT_BUFFER) + { + printf("DeviceIoControl(IOCTL_DISK_GET_DRIVE_LAYOUT) failed! Error: %lu\n", + dwLastError); + + /* Bail out if any other error than "invalid function" has been emitted. + * This happens for example when calling it on GPT disks. */ + if (dwLastError != ERROR_INVALID_FUNCTION) + { + free(LayoutBuffer); + CloseHandle(hDisk); + return 0; + } + else + { + /* Just stop getting this information */ + break; + } + } + + /* Reallocate the buffer */ + BufferSize += 4 * sizeof(PARTITION_INFORMATION); + ptr = realloc(LayoutBuffer, BufferSize); + if (!ptr) + { + printf("Out of memory!"); + free(LayoutBuffer); + CloseHandle(hDisk); + return 0; + } + LayoutBuffer = ptr; + memset(LayoutBuffer, 0, BufferSize); + } + + if (dwLastError == ERROR_SUCCESS) + { +#ifdef DUMP_DATA + HexDump(LayoutBuffer, dwRead); +#endif + + printf("IOCTL_DISK_GET_DRIVE_LAYOUT\n" + "Partitions: %lu Signature: 0x%08lx\n", + LayoutBuffer->PartitionCount, + LayoutBuffer->Signature); + + for (i = 0; i < LayoutBuffer->PartitionCount; i++) + { + printf(" %ld: nr: %ld boot: %1x type: %x start: 0x%016I64x count: 0x%016I64x hidden: 0x%lx\n", + i, + LayoutBuffer->PartitionEntry[i].PartitionNumber, + LayoutBuffer->PartitionEntry[i].BootIndicator, + LayoutBuffer->PartitionEntry[i].PartitionType, + LayoutBuffer->PartitionEntry[i].StartingOffset.QuadPart, + LayoutBuffer->PartitionEntry[i].PartitionLength.QuadPart, + LayoutBuffer->PartitionEntry[i].HiddenSectors); + } + free(LayoutBuffer); + } + + + /* + * Retrieve the extended partition layout + */ + printf("\n"); + + /* Allocate a layout buffer with 4 partition entries first */ + BufferSize = sizeof(DRIVE_LAYOUT_INFORMATION_EX) + + ((4 - ANYSIZE_ARRAY) * sizeof(PARTITION_INFORMATION_EX)); + LayoutBufferEx = malloc(BufferSize); + if (!LayoutBufferEx) + { + printf("Out of memory!"); + CloseHandle(hDisk); return 0; } + memset(LayoutBufferEx, 0, BufferSize); - CloseHandle(hDisk); + /* Keep looping while the drive layout buffer is too small */ + for (;;) + { + if (DeviceIoControl(hDisk, + IOCTL_DISK_GET_DRIVE_LAYOUT_EX, + NULL, + 0, + LayoutBufferEx, + BufferSize, + &dwRead, + NULL)) + { + dwLastError = ERROR_SUCCESS; + break; + } + dwLastError = GetLastError(); + if (dwLastError != ERROR_INSUFFICIENT_BUFFER) + { + printf("DeviceIoControl(IOCTL_DISK_GET_DRIVE_LAYOUT_EX) failed! Error: %lu\n", + dwLastError); + + /* Bail out if any other error than "invalid function" has been emitted */ + if (dwLastError != ERROR_INVALID_FUNCTION) + { + free(LayoutBufferEx); + CloseHandle(hDisk); + return 0; + } + else + { + /* Just stop getting this information */ + break; + } + } + + /* Reallocate the buffer */ + BufferSize += 4 * sizeof(PARTITION_INFORMATION_EX); + ptr = realloc(LayoutBufferEx, BufferSize); + if (!ptr) + { + printf("Out of memory!"); + free(LayoutBufferEx); + CloseHandle(hDisk); + return 0; + } + LayoutBufferEx = ptr; + memset(LayoutBufferEx, 0, BufferSize); + } + + if (dwLastError == ERROR_SUCCESS) + { #ifdef DUMP_DATA - HexDump(LayoutBuffer, dwRead); + HexDump(LayoutBufferEx, dwRead); #endif - printf("Partitions %lu Signature %lx\n", - LayoutBuffer->PartitionCount, - LayoutBuffer->Signature); + printf("IOCTL_DISK_GET_DRIVE_LAYOUT_EX\n" + "PartitionStyle: [%s]\n", + PARTITION_STYLE_NAME(LayoutBufferEx->PartitionStyle)); - for (i = 0; i < LayoutBuffer->PartitionCount; i++) - { - printf(" %ld: nr: %ld boot: %1x type: %x start: 0x%I64x count: 0x%I64x\n", - i, - LayoutBuffer->PartitionEntry[i].PartitionNumber, - LayoutBuffer->PartitionEntry[i].BootIndicator, - LayoutBuffer->PartitionEntry[i].PartitionType, - LayoutBuffer->PartitionEntry[i].StartingOffset.QuadPart, - LayoutBuffer->PartitionEntry[i].PartitionLength.QuadPart); - } + if (LayoutBufferEx->PartitionStyle == PARTITION_STYLE_MBR) + { + printf("Partitions: %lu Signature: 0x%08lx", + LayoutBufferEx->PartitionCount, + LayoutBufferEx->Mbr.Signature); +#if (NTDDI_VERSION >= NTDDI_WIN10_RS1) + printf(" Checksum 0x%08lx\n", + LayoutBufferEx->Mbr.CheckSum); +#else + printf("\n"); +#endif + + for (i = 0; i < LayoutBufferEx->PartitionCount; i++) + { + printf(" %ld: nr: %ld [%s] boot: %1x type: %x start: 0x%016I64x count: 0x%016I64x hidden: 0x%lx\n", + i, + LayoutBufferEx->PartitionEntry[i].PartitionNumber, + PARTITION_STYLE_NAME(LayoutBufferEx->PartitionEntry[i].PartitionStyle), + LayoutBufferEx->PartitionEntry[i].Mbr.BootIndicator, + LayoutBufferEx->PartitionEntry[i].Mbr.PartitionType, + LayoutBufferEx->PartitionEntry[i].StartingOffset.QuadPart, + LayoutBufferEx->PartitionEntry[i].PartitionLength.QuadPart, + LayoutBufferEx->PartitionEntry[i].Mbr.HiddenSectors); +#if (NTDDI_VERSION >= NTDDI_WINBLUE) + Guid = LayoutBufferEx->PartitionEntry[i].Mbr.PartitionId; + printf(" PartitionId: {" GUID_FORMAT_STR "}\n", + GUID_ELEMENTS(&Guid)); +#endif + } + } + else if (LayoutBufferEx->PartitionStyle == PARTITION_STYLE_GPT) + { + Guid = LayoutBufferEx->Gpt.DiskId; + printf("Partitions: %lu MaxPartitionCount: %lu\n" + "DiskId: {" GUID_FORMAT_STR "}\n" + "StartingUsableOffset: 0x%016I64x UsableLength: 0x%016I64x\n", + LayoutBufferEx->PartitionCount, + LayoutBufferEx->Gpt.MaxPartitionCount, + GUID_ELEMENTS(&Guid), + LayoutBufferEx->Gpt.StartingUsableOffset.QuadPart, + LayoutBufferEx->Gpt.UsableLength.QuadPart); - free(LayoutBuffer); + for (i = 0; i < LayoutBufferEx->PartitionCount; i++) + { + printf(" %ld: nr: %ld [%s]\n" + " type : {" GUID_FORMAT_STR "}\n" + " id : {" GUID_FORMAT_STR "}\n" + " attrs: 0x%016I64x\n" + " name : '%.*S'\n" + " start: 0x%016I64x count: 0x%016I64x\n", + i, + LayoutBufferEx->PartitionEntry[i].PartitionNumber, + PARTITION_STYLE_NAME(LayoutBufferEx->PartitionEntry[i].PartitionStyle), + GUID_ELEMENTS(&LayoutBufferEx->PartitionEntry[i].Gpt.PartitionType), + GUID_ELEMENTS(&LayoutBufferEx->PartitionEntry[i].Gpt.PartitionId), + LayoutBufferEx->PartitionEntry[i].Gpt.Attributes, + _countof(LayoutBufferEx->PartitionEntry[i].Gpt.Name), + LayoutBufferEx->PartitionEntry[i].Gpt.Name, + LayoutBufferEx->PartitionEntry[i].StartingOffset.QuadPart, + LayoutBufferEx->PartitionEntry[i].PartitionLength.QuadPart); + } + } - // TODO: Retrieve the extended partition layout + free(LayoutBufferEx); + } + + CloseHandle(hDisk); return 0; }

1 0

[reactos] 01/02: [ROSAPPS:PARTINFO] Code formatting.
by Hermès Bélusca-Maïto 26 Nov '20

26 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=118fa50269c8af2a14dca… commit 118fa50269c8af2a14dcab9ca97db7c4a42f4dac Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 26 01:25:53 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 26 03:33:37 2020 +0100 [ROSAPPS:PARTINFO] Code formatting. --- .../sysutils/utils/partinfo/partinfo.c | 288 ++++++++++----------- 1 file changed, 142 insertions(+), 146 deletions(-) diff --git a/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c b/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c index aebb04a5f79..7d72e8cbacd 100644 --- a/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c +++ b/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c @@ -2,210 +2,206 @@ * partinfo - partition info program */ +#include <stdio.h> +#include <stdlib.h> + #define WIN32_NO_STATUS #include <windows.h> -#include <stdlib.h> #include <ntndk.h> -#include <stdio.h> -//#define DUMP_DATA +// #define DUMP_DATA #define DUMP_SIZE_INFO #ifdef DUMP_DATA -void HexDump(char *buffer, ULONG size) +void HexDump( + IN PVOID buffer, + IN ULONG size) { - ULONG offset = 0; - unsigned char *ptr; + ULONG_PTR offset = 0; + PUCHAR ptr; - while (offset < (size & ~15)) + while (offset < (size & ~15)) { - ptr = (unsigned char*)((ULONG)buffer + offset); - printf("%08lx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx-%02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx\n", - offset, - ptr[0], - ptr[1], - ptr[2], - ptr[3], - ptr[4], - ptr[5], - ptr[6], - ptr[7], - ptr[8], - ptr[9], - ptr[10], - ptr[11], - ptr[12], - ptr[13], - ptr[14], - ptr[15]); + ptr = (PUCHAR)((ULONG_PTR)buffer + offset); + printf("%08lx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx-%02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx\n", + offset, + ptr[0], ptr[1], ptr[2] , ptr[3] , ptr[4] , ptr[5] , ptr[6] , ptr[7], + ptr[8], ptr[9], ptr[10], ptr[11], ptr[12], ptr[13], ptr[14], ptr[15]); offset += 16; } - ptr = (unsigned char*)((ULONG)buffer + offset); - printf("%08lx ", offset); - while (offset < size) + ptr = (PUCHAR)((ULONG_PTR)buffer + offset); + printf("%08lx ", offset); + while (offset < size) { - printf(" %02hx", *ptr); - offset++; - ptr++; + printf(" %02hx", *ptr); + offset++; + ptr++; } - printf("\n\n\n"); + printf("\n\n\n"); } #endif - void Usage(void) { - puts("Usage: partinfo <drive number>"); + puts("Usage: partinfo <drive number>"); } - -int main (int argc, char *argv[]) +int main(int argc, char *argv[]) { - HANDLE hDisk; - DWORD dwRead; - DWORD i; - char *Buffer; - DRIVE_LAYOUT_INFORMATION *LayoutBuffer; - DISK_GEOMETRY DiskGeometry; - ULONG ulDrive; - CHAR DriveName[40]; - SYSTEM_DEVICE_INFORMATION DeviceInfo; - NTSTATUS Status; - - if (argc != 2) + NTSTATUS Status; + ULONG ulDrive; + HANDLE hDisk; + DWORD dwRead; + DWORD i; + SYSTEM_DEVICE_INFORMATION DeviceInfo; + DISK_GEOMETRY DiskGeometry; + PDRIVE_LAYOUT_INFORMATION LayoutBuffer; + CHAR DriveName[40]; + + if (argc != 2) { - Usage(); - return(0); + Usage(); + return 0; } - ulDrive = strtoul(argv[1], NULL, 10); - if (errno != 0) + ulDrive = strtoul(argv[1], NULL, 10); + if (errno != 0) { - printf("Error: Malformed drive number\n"); - return(0); + printf("Error: Malformed drive number\n"); + return 0; } - /* Check drive number */ - Status = NtQuerySystemInformation(SystemDeviceInformation, - &DeviceInfo, - sizeof(SYSTEM_DEVICE_INFORMATION), - &i); - if (!NT_SUCCESS(Status)) + /* + * Retrieve the number of disks on the system. + */ + Status = NtQuerySystemInformation(SystemDeviceInformation, + &DeviceInfo, + sizeof(DeviceInfo), + &i); + if (!NT_SUCCESS(Status)) { - printf("NtQuerySystemInformation() failed (Status %lx)\n", Status); - return(0); + printf("NtQuerySystemInformation() failed (Status %lx)\n", Status); + return 0; } - - if (DeviceInfo.NumberOfDisks == 0) + if (DeviceInfo.NumberOfDisks == 0) { - printf("No disk drive installed!\n"); - return(0); + printf("No disk drive installed!\n"); + return 0; } - if (ulDrive >= DeviceInfo.NumberOfDisks) + if (ulDrive >= DeviceInfo.NumberOfDisks) { - printf("Invalid disk drive number! Valid drive numbers [0-%lu]\n", - DeviceInfo.NumberOfDisks-1); - return(0); + printf("Invalid disk drive number! Valid drive numbers [0-%lu]\n", + DeviceInfo.NumberOfDisks-1); + return 0; } - /* Build full drive name */ - sprintf(DriveName, "\\\\.\\PHYSICALDRIVE%lu", ulDrive); - - /* Open drive */ - hDisk = CreateFileA(DriveName, - GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_EXISTING, - 0, - NULL); - if (hDisk == INVALID_HANDLE_VALUE) + /* Build the full drive name */ + sprintf(DriveName, "\\\\.\\PHYSICALDRIVE%lu", ulDrive); + + /* Open the drive */ + hDisk = CreateFileA(DriveName, + GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + 0, + NULL); + if (hDisk == INVALID_HANDLE_VALUE) { - printf("Invalid disk handle!"); - return 0; + printf("Invalid disk handle!"); + return 0; } - /* Get drive geometry */ - if (!DeviceIoControl(hDisk, - IOCTL_DISK_GET_DRIVE_GEOMETRY, - NULL, - 0, - &DiskGeometry, - sizeof(DISK_GEOMETRY), - &dwRead, - NULL)) + /* + * Get the drive geometry. + */ + if (!DeviceIoControl(hDisk, + IOCTL_DISK_GET_DRIVE_GEOMETRY, + NULL, + 0, + &DiskGeometry, + sizeof(DiskGeometry), + &dwRead, + NULL)) { - CloseHandle(hDisk); - printf("DeviceIoControl failed! Error: %lu\n", - GetLastError()); - return 0; + printf("DeviceIoControl(IOCTL_DISK_GET_DRIVE_GEOMETRY) failed! Error: %lu\n", + GetLastError()); + CloseHandle(hDisk); + return 0; } #ifdef DUMP_DATA - HexDump((char*)&DiskGeometry, dwRead); + HexDump(&DiskGeometry, dwRead); +#endif + printf("Drive number: %lu\n", ulDrive); + printf("Cylinders: %I64u\nMediaType: %x\nTracksPerCylinder: %lu\n" + "SectorsPerTrack: %lu\nBytesPerSector: %lu\n\n", + DiskGeometry.Cylinders.QuadPart, + DiskGeometry.MediaType, + DiskGeometry.TracksPerCylinder, + DiskGeometry.SectorsPerTrack, + DiskGeometry.BytesPerSector); + +#if 0 // TODO! + /* Get extended drive geometry */ + // IOCTL_DISK_GET_DRIVE_GEOMETRY_EX #endif - printf("Drive number: %lu\n", ulDrive); - printf("Cylinders: %I64u\nMediaType: %x\nTracksPerCylinder: %lu\n" - "SectorsPerTrack: %lu\nBytesPerSector: %lu\n\n", - DiskGeometry.Cylinders.QuadPart, - DiskGeometry.MediaType, - DiskGeometry.TracksPerCylinder, - DiskGeometry.SectorsPerTrack, - DiskGeometry.BytesPerSector); - - - Buffer = (char*)malloc(8192); - if (Buffer == NULL) + + /* + * Retrieve the legacy partition layout + */ + LayoutBuffer = (PDRIVE_LAYOUT_INFORMATION)malloc(8192); + if (LayoutBuffer == NULL) { - CloseHandle(hDisk); - printf("Out of memory!"); - return 0; + printf("Out of memory!"); + CloseHandle(hDisk); + return 0; } - memset(Buffer, 0, 8192); - - if (!DeviceIoControl(hDisk, - IOCTL_DISK_GET_DRIVE_LAYOUT, - NULL, - 0, - Buffer, - 8192, - &dwRead, - NULL)) + memset(LayoutBuffer, 0, 8192); + + if (!DeviceIoControl(hDisk, + IOCTL_DISK_GET_DRIVE_LAYOUT, + NULL, + 0, + LayoutBuffer, + 8192, + &dwRead, + NULL)) { - CloseHandle(hDisk); - printf("DeviceIoControl(IOCTL_DISK_GET_DRIVE_LAYOUT) failed! Error: %lu\n", - GetLastError()); - free(Buffer); - return 0; + printf("DeviceIoControl(IOCTL_DISK_GET_DRIVE_LAYOUT) failed! Error: %lu\n", + GetLastError()); + CloseHandle(hDisk); + free(LayoutBuffer); + return 0; } - CloseHandle(hDisk); + CloseHandle(hDisk); #ifdef DUMP_DATA - HexDump(Buffer, dwRead); + HexDump(LayoutBuffer, dwRead); #endif - LayoutBuffer = (DRIVE_LAYOUT_INFORMATION*)Buffer; - - printf("Partitions %lu Signature %lx\n", - LayoutBuffer->PartitionCount, - LayoutBuffer->Signature); + printf("Partitions %lu Signature %lx\n", + LayoutBuffer->PartitionCount, + LayoutBuffer->Signature); - for (i = 0; i < LayoutBuffer->PartitionCount; i++) + for (i = 0; i < LayoutBuffer->PartitionCount; i++) { - printf(" %ld: nr: %ld boot: %1x type: %x start: 0x%I64x count: 0x%I64x\n", - i, - LayoutBuffer->PartitionEntry[i].PartitionNumber, - LayoutBuffer->PartitionEntry[i].BootIndicator, - LayoutBuffer->PartitionEntry[i].PartitionType, - LayoutBuffer->PartitionEntry[i].StartingOffset.QuadPart, - LayoutBuffer->PartitionEntry[i].PartitionLength.QuadPart); + printf(" %ld: nr: %ld boot: %1x type: %x start: 0x%I64x count: 0x%I64x\n", + i, + LayoutBuffer->PartitionEntry[i].PartitionNumber, + LayoutBuffer->PartitionEntry[i].BootIndicator, + LayoutBuffer->PartitionEntry[i].PartitionType, + LayoutBuffer->PartitionEntry[i].StartingOffset.QuadPart, + LayoutBuffer->PartitionEntry[i].PartitionLength.QuadPart); } - free(Buffer); + free(LayoutBuffer); + + // TODO: Retrieve the extended partition layout - return 0; + return 0; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2020