Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SYSETUP][INF] Add name support for account privilege setup
by Eric Kohl 16 Jan '21

16 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=baf9ff45bb7f289b02d1b… commit baf9ff45bb7f289b02d1bcc22f85d4a5196f8139 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jan 16 13:18:08 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jan 16 13:18:08 2021 +0100 [SYSETUP][INF] Add name support for account privilege setup --- dll/win32/syssetup/security.c | 32 +++++++++++++++++++++++++++++--- media/inf/defltwk.inf | 10 ++++++++-- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index 0bf4167ebc0..2ac2c3a4917 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -282,7 +282,8 @@ InstallPrivileges( PSID AccountSid = NULL; NTSTATUS Status; LSA_HANDLE PolicyHandle = NULL; - LSA_UNICODE_STRING RightString; + LSA_UNICODE_STRING RightString, AccountName; + PLSA_REFERENCED_DOMAIN_LIST ReferencedDomains = NULL; PLSA_TRANSLATED_SID2 Sids = NULL; DPRINT("InstallPrivileges()\n"); @@ -351,8 +352,33 @@ InstallPrivileges( else { DPRINT("Account name: %S\n", szSidString); - continue; - + + ReferencedDomains = NULL; + Sids = NULL; + RtlInitUnicodeString(&AccountName, szSidString); + Status = LsaLookupNames2(PolicyHandle, + 0, + 1, + &AccountName, + &ReferencedDomains, + &Sids); + if (ReferencedDomains != NULL) + { + LsaFreeMemory(ReferencedDomains); + } + + if (!NT_SUCCESS(Status)) + { + DPRINT1("LsaLookupNames2() failed (Status 0x%08lx)\n", Status); + + if (Sids != NULL) + { + LsaFreeMemory(Sids); + Sids = NULL; + } + + continue; + } } RtlInitUnicodeString(&RightString, szPrivilegeString); diff --git a/media/inf/defltwk.inf b/media/inf/defltwk.inf index d23b0d861ea..5aa1acf4b48 100644 --- a/media/inf/defltwk.inf +++ b/media/inf/defltwk.inf @@ -42,7 +42,7 @@ SeEnableDelegationPrivilege = SeImpersonatePrivilege = *S-1-5-6, *S-1-5-32-544 SeIncreaseBasePriorityPrivilege = *S-1-5-32-544 SeIncreaseQuotaPrivilege = *S-1-5-19, *S-1-5-20, *S-1-5-32-544 -SeInteractiveLogonRight = *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-547, *S-1-5-32-551 +SeInteractiveLogonRight = *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-547, *S-1-5-32-551, %SceInfGuest% SeLoadDriverPrivilege = *S-1-5-32-544 SeLockMemoryPrivilege = SeMachineAccountPrivilege = @@ -78,4 +78,10 @@ MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\DontDisplayLas MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\LegalNoticeCaption = 1, "" MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\LegalNoticeText = 7, "" MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\ShutdownWithoutLogon = 4, 1 -MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\UndockWithoutLogon = 4, 1 \ No newline at end of file +MACHINE\Software\Microsoft\Windows\CurrentVersion\Policies\System\UndockWithoutLogon = 4, 1 + +[Strings] +SceInfGuest = "Guest" + +[Strings.0407] +SceInfGuest = "Gast"

1 0

[reactos] 01/01: [CMAKE] Fix MSVC configuring
by Mark Jansen 15 Jan '21

15 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69dffed3f7f6f6bad0f83… commit 69dffed3f7f6f6bad0f834352ab44053646758c1 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Jan 7 22:46:50 2021 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Jan 15 20:43:10 2021 +0100 [CMAKE] Fix MSVC configuring --- sdk/lib/crt/msvcrtex.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index d969ba53b47..06bab6a5021 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -109,6 +109,7 @@ if(MSVC AND (ARCH STREQUAL "i386")) add_asm_files(ftol2_asm math/i386/ftol2_asm.s) add_library(ftol2_sse OBJECT ${ftol2_asm}) target_compile_definitions(ftol2_sse PRIVATE $<TARGET_PROPERTY:msvcrtex,COMPILE_DEFINITIONS>) + set_target_properties(ftol2_sse PROPERTIES LINKER_LANGUAGE C) endif()

1 0

[reactos] 01/01: [CMD] Improve Indonesian (id-ID) translation (#3417)
by Reinhart Previano Koentjoro 12 Jan '21

12 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c8ed68544f1adf49fb94… commit 9c8ed68544f1adf49fb941d83a807159433e4323 Author: Reinhart Previano Koentjoro <reinhart_previano(a)yahoo.com> AuthorDate: Wed Jan 6 08:53:51 2021 +0700 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Jan 12 13:14:08 2021 +0300 [CMD] Improve Indonesian (id-ID) translation (#3417) --- base/shell/cmd/lang/id-ID.rc | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc index a49c4598e5d..8f12beb3526 100644 --- a/base/shell/cmd/lang/id-ID.rc +++ b/base/shell/cmd/lang/id-ID.rc @@ -54,7 +54,7 @@ ERRORLEVEL disetel ke ofset tombol yang ditekan pengguna dalam pilihan.\n" STRING_CMD_HELP7 " [pengalihan dan piping]" STRING_CMD_HELP8 "Memulai instan baru dari interpreter baris perintah ReactOS.\n\n\ CMD [/[C|K] command][/P][/Q][/T:bf]\n\n\ - /C command Menjalankan perintah yang ditetapkan dan mengakhiri.\n\ + /C command Menjalankan perintah yang ditetapkan dan mengakhirinya.\n\ /K command Menjalankan perintah yang ditetapkan dan tetap tinggal.\n\ /P CMD menjadi permanen dan menjalankan autoexec.bat\n\ (tidak bisa diakhiri).\n\ @@ -66,17 +66,17 @@ COLOR [attr [/-F]]\n\n\ Ada tiga cara untuk menetapkan warna:\n\ 1) [bright] nama pada [bright] nama (hanya tiga huruf pertama yang dipakai)\n\ 2) desimal pada desimal\n\ -3) dua digit heksa\n\n\ +3) dua digit heksadesimal\n\n\ Warna adalah:\n\ -des heksa nama des hex nama\n\ -0 0 Black 8 8 Abu-Abu(Hitam terang)\n\ -1 1 Blue 9 9 Biru Terang\n\ -2 2 Green 10 A Hijau Terang\n\ -3 3 Cyan 11 B Biru Muda Terang\n\ -4 4 Red 12 C Merah Terang\n\ -5 5 Magenta 13 D Magenta Terang\n\ -6 6 Yellow 14 E Kuning Terang\n\ -7 7 White 15 F Putih Terang\n" +des heksa nama des heksa nama\n\ +0 0 Hitam 8 8 Abu-Abu(Hitam terang)\n\ +1 1 Biru 9 9 Biru Terang\n\ +2 2 Hijau 10 A Hijau Terang\n\ +3 3 Biru Muda 11 B Biru Muda Terang\n\ +4 4 Merah 12 C Merah Terang\n\ +5 5 Magenta 13 D Magenta Terang\n\ +6 6 Kuning 14 E Kuning Terang\n\ +7 7 Putih 15 F Putih Terang\n" STRING_COPY_HELP1 "Timpa %s (Ya/Tidak/Semua)? " STRING_COPY_HELP2 "Mengcopy satu atau lebih file ke lokasi lain.\n\n\ COPY [/V][/Y|/-Y][/A|/B] sumber [/A|/B]\n\ @@ -332,7 +332,7 @@ REN [/E /N /P /Q /S /T] nama_lama ... nama_baru\n\n\ /Q Diam-diam.\n\ /S Mengganti nama subdirektori.\n\ /T Menampilkan jumlah total dari file yang diganti nama.\n\n\ -Catatan bahwa anda tidak bisa menetapkan drive baru atau path untuk\n\ +Mohon dicatat bahwa anda tidak dapat menetapkan drive baru atau path untuk\n\ tujuan anda. Gunakan perintah MOVE untuk keperluan itu.\n" STRING_REN_HELP2 " %lu file diganti nama\n" STRING_REN_HELP3 " %lu file diganti nama\n" @@ -386,7 +386,7 @@ START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ MIN Starts with a minimized window.\n\ MAX Starts with a maximized window.\n\ WAIT Starts the command or program and waits for its termination.\n\ - command Menetapkab perintah yang dilaksanakan.\n\ + command Menetapkan perintah yang dilaksanakan.\n\ parameters Specifies the parameters to be given to the command or program.\n" STRING_TITLE_HELP "Menyetel judul jendela untuk jendela prompt perintah.\n\n\ TITLE [string]\n\n\ @@ -429,15 +429,15 @@ VER [/C][/R][/W]\n\n\ /R Menampilkan informasi redistribusi.\n\ /W menampilkan informasi jaminan." STRING_VERSION_HELP2 " datang dengan MUTLAK TANPA JAMINAN; untuk lengkapnya\n\ -ketik: 'ver /w'. Program ini adalah software bebas; anda bisa membagikannya\n\ -di bawah kondisi tertentu; ketik 'ver /r' untuk lengkapnya. Ketik 'ver /c'\n\ +ketik: 'ver /w'. Program ini adalah software bebas; anda dapat membagikannya\n\ +di bawah kondisi tertentu; ketik 'ver /r' untuk informasi selengkapnya. Ketik 'ver /c'\n\ untuk daftar penghargaan." STRING_VERSION_HELP3 "\n Program ini didistribusikan dengan harapan berguna,\n\ tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari\n\ MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU. Lihat\n\ GNU General Public License untuk lebih jelasnya." STRING_VERSION_HELP4 "\n Program ini adalah software bebas; anda dapat mendistribusikan dan/atau\n\ - mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\n" + mengubahnya di bawah ketentuan lisensi GNU General Public License sebagaimana dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\n" STRING_VERSION_HELP5 "\nKirim laporan bug ke <ros-dev(a)reactos.org>.\n\ Pemutakiran tersedia di: http://www.reactos.org" STRING_VERSION_HELP6 "\nVersi FreeDOS ditulis oleh:\n" @@ -517,19 +517,19 @@ title judul baru\n" STRING_ERROR_CANNOTPIPE "Salah! Tidak bisa melakukan pipe! Tidak bisa membuka file temporal!\n" STRING_ERROR_D_PAUSEMSG "Tekan tombol untuk melanjutkan . . . " STRING_ERROR_DRIVER_NOT_READY "Drive tidak siap" - STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" - STRING_REPLACE_ERROR1 "Invalid switch - %s\n" - STRING_REPLACE_ERROR2 "Path not found - %s\n" - STRING_REPLACE_ERROR3 "The filename, directory name, or volume label syntax is incorrect.\n" - STRING_REPLACE_ERROR4 "Invalid parameter combination\n" - STRING_REPLACE_ERROR5 "Access denied - %s\n" + STRING_SET_ENV_ERROR "Variabel lingkungan '%s' tidak terdefinisi\n" + STRING_REPLACE_ERROR1 "Saklar perintah tidak valid - %s\n" + STRING_REPLACE_ERROR2 "Alamat file/direktori tidak ditemukan - %s\n" + STRING_REPLACE_ERROR3 "Sintaks nama file, direktori, atau label volume tidak benar.\n" + STRING_REPLACE_ERROR4 "Kombinasi parameter tidak valid\n" + STRING_REPLACE_ERROR5 "Akses ditolak - %s\n" STRING_REPLACE_ERROR6 "No files found - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n" - STRING_CMD_SHELLINFO "\nInterpreter Baris Perintah ReactOS\nVersion %s %s" + STRING_REACTOS_VERSION "ReactOS [Versi %s %s]\n" + STRING_CMD_SHELLINFO "\nInterpreter Baris Perintah ReactOS\nVersi %s %s" STRING_VERSION_RUNNING_ON "Berjalan pada: " - STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" + STRING_VERSION_RUNVER "%s [Versi %d.%d.%d] %s" STRING_COPY_FILE " %d file di-copy\n" STRING_DELETE_WIPE "dihapus" STRING_FOR_ERROR "spesifikasi variabel tidak baik." @@ -540,7 +540,7 @@ title judul baru\n" STRING_MKLINK_CREATED_HARD "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION "Junction created for %s <<===>> %s\n" STRING_MORE "More? " - STRING_CANCEL_BATCH_FILE "\r\nCtrl-Break pressed. Cancel batch file? (Ya/Tidak/Semua) " + STRING_CANCEL_BATCH_FILE "\r\nCtrl-Break ditekan. Batalkan operasi file batch? (Ya/Tidak/Semua) " STRING_INVALID_OPERAND "Operand tidak benar.\n" STRING_EXPECTED_CLOSE_PAREN "Diharapkan ')'.\n" STRING_EXPECTED_NUMBER_OR_VARIABLE "Nomor atau nama variabel diharapkan.\n"

1 0

[reactos] 01/01: [RAPPS] Fix pinned certificate issuer check
by Stanislav Motylkov 11 Jan '21

11 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f77f5a30cfd841bb94ae3… commit f77f5a30cfd841bb94ae3c88627e1ae374807115 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Jan 11 19:16:16 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Jan 11 19:16:16 2021 +0300 [RAPPS] Fix pinned certificate issuer check --- base/applications/rapps/loaddlg.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index fb060358e55..836bb150ab0 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -50,7 +50,8 @@ #include "misc.h" #ifdef USE_CERT_PINNING -#define CERT_ISSUER_INFO "US\r\nLet's Encrypt\r\nLet's Encrypt Authority X3" +#define CERT_ISSUER_INFO_OLD "US\r\nLet's Encrypt\r\nLet's Encrypt Authority X3" +#define CERT_ISSUER_INFO_NEW "US\r\nLet's Encrypt\r\nR3" #define CERT_SUBJECT_INFO "rapps.reactos.org" #endif @@ -832,7 +833,8 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) else { if (strcmp(subjectName, CERT_SUBJECT_INFO) || - strcmp(issuerName, CERT_ISSUER_INFO)) + (strcmp(issuerName, CERT_ISSUER_INFO_OLD) && + strcmp(issuerName, CERT_ISSUER_INFO_NEW))) { szMsgText.Format(IDS_MISMATCH_CERT_INFO, (char*)subjectName, (const char*)issuerName); bAskQuestion = true;

1 0

[reactos] 01/01: [NDK] "Reserved" member in SYSTEM_PROCESSOR_INFORMATION is "MaximumProcessors" for Windows 8+ (#3421)
by Alex Henrie 09 Jan '21

09 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35f303487986752b71711… commit 35f303487986752b717112c69227f8075b0174a3 Author: Alex Henrie <alexhenrie24(a)gmail.com> AuthorDate: Sat Jan 9 15:15:36 2021 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 9 23:15:36 2021 +0100 [NDK] "Reserved" member in SYSTEM_PROCESSOR_INFORMATION is "MaximumProcessors" for Windows 8+ (#3421) Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- ntoskrnl/ex/sysinfo.c | 4 ++++ sdk/include/ndk/extypes.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index aa999b2a023..64cbffc5ba1 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -657,7 +657,11 @@ QSI_DEF(SystemProcessorInformation) Spi->ProcessorArchitecture = KeProcessorArchitecture; Spi->ProcessorLevel = KeProcessorLevel; Spi->ProcessorRevision = KeProcessorRevision; +#if (NTDDI_VERSION < NTDDI_WIN8) Spi->Reserved = 0; +#else + Spi->MaximumProcessors = 0; +#endif Spi->ProcessorFeatureBits = KeFeatureBits; DPRINT("Arch %u Level %u Rev 0x%x\n", Spi->ProcessorArchitecture, diff --git a/sdk/include/ndk/extypes.h b/sdk/include/ndk/extypes.h index 7751241d114..360a257dafe 100644 --- a/sdk/include/ndk/extypes.h +++ b/sdk/include/ndk/extypes.h @@ -756,7 +756,11 @@ typedef struct _SYSTEM_PROCESSOR_INFORMATION USHORT ProcessorArchitecture; USHORT ProcessorLevel; USHORT ProcessorRevision; +#if (NTDDI_VERSION < NTDDI_WIN8) USHORT Reserved; +#else + USHORT MaximumProcessors; +#endif ULONG ProcessorFeatureBits; } SYSTEM_PROCESSOR_INFORMATION, *PSYSTEM_PROCESSOR_INFORMATION;

1 0

[reactos] 01/01: [CMAKE] Fix host-tools path for MSVC IDE
by Mark Jansen 08 Jan '21

08 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b1bf3aae5082d06ffac04… commit b1bf3aae5082d06ffac04b2a747e60b4ef42d382 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Jan 7 23:48:01 2021 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Jan 8 21:12:11 2021 +0100 [CMAKE] Fix host-tools path for MSVC IDE --- sdk/cmake/host-tools.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index 08e91da0216..a738ff64c09 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -9,6 +9,9 @@ function(setup_host_tools) list(TRANSFORM HOST_TOOLS PREPEND "${REACTOS_BINARY_DIR}/host-tools/bin/" OUTPUT_VARIABLE HOST_TOOLS_OUTPUT) if (CMAKE_HOST_WIN32) list(TRANSFORM HOST_TOOLS_OUTPUT APPEND ".exe") + if(MSVC_IDE) + set(HOST_EXTRA_DIR "$(ConfigurationName)/") + endif() set(HOST_EXE_SUFFIX ".exe") endif() @@ -26,7 +29,7 @@ function(setup_host_tools) foreach(_tool ${HOST_TOOLS}) add_executable(native-${_tool} IMPORTED) - set_target_properties(native-${_tool} PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/bin/${_tool}${HOST_EXE_SUFFIX}) - add_dependencies(native-${_tool} host-tools ${INSTALL_DIR}/bin/${_tool}${HOST_EXE_SUFFIX}) + set_target_properties(native-${_tool} PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/bin/${HOST_EXTRA_DIR}${_tool}${HOST_EXE_SUFFIX}) + add_dependencies(native-${_tool} host-tools ${INSTALL_DIR}/bin/${HOST_EXTRA_DIR}${_tool}${HOST_EXE_SUFFIX}) endforeach() endfunction()

1 0

[reactos] 01/01: [PSDK] Whoopsie... Fix "PPPARTITION_INFORMATION_GPT" typo (extra 'P'), caught by BieHDC :) Addendum to 8a6ed591.
by Hermès Bélusca-Maïto 08 Jan '21

08 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1303a7dc1c1fce3278894… commit 1303a7dc1c1fce3278894f43ba7fd8adca8aeef6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jan 8 16:37:28 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jan 8 17:12:21 2021 +0100 [PSDK] Whoopsie... Fix "PPPARTITION_INFORMATION_GPT" typo (extra 'P'), caught by BieHDC :) Addendum to 8a6ed591. --- sdk/include/psdk/winioctl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/psdk/winioctl.h b/sdk/include/psdk/winioctl.h index 8debea1f5d7..33a64c3aaa4 100644 --- a/sdk/include/psdk/winioctl.h +++ b/sdk/include/psdk/winioctl.h @@ -419,7 +419,7 @@ typedef struct _PARTITION_INFORMATION_GPT { GUID PartitionId; DWORD64 Attributes; WCHAR Name[36]; -} PARTITION_INFORMATION_GPT, *PPPARTITION_INFORMATION_GPT; +} PARTITION_INFORMATION_GPT, *PPARTITION_INFORMATION_GPT; typedef struct _PARTITION_INFORMATION_MBR { BYTE PartitionType; BOOLEAN BootIndicator;

1 0

[reactos] 01/01: [PARTINFO] Fix GCC build on GitHub Actions
by Stanislav Motylkov 08 Jan '21

08 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=795c9c439c3f925b1593b… commit 795c9c439c3f925b1593b12e491023a2e441bf8b Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jan 8 16:36:48 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Jan 8 16:36:48 2021 +0300 [PARTINFO] Fix GCC build on GitHub Actions Addendum to c087487b. --- modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c b/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c index 38cd7f77549..704affad409 100644 --- a/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c +++ b/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c @@ -270,7 +270,7 @@ int main(int argc, char *argv[]) pDiskGeometry->BytesPerSector, DiskGeometry.InfoEx.DiskSize.QuadPart); - printf("SizeOfDetectInfo: %lu DetectionType: %lu (%s)\n", + printf("SizeOfDetectInfo: %lu DetectionType: %u (%s)\n", DiskGeometry.InfoEx.Detection.SizeOfDetectInfo, DiskGeometry.InfoEx.Detection.DetectionType, DETECT_TYPE_NAME(DiskGeometry.InfoEx.Detection.DetectionType)); @@ -304,7 +304,7 @@ int main(int argc, char *argv[]) break; } - printf("SizeOfPartitionInfo: %lu PartitionStyle: %lu [%s]\n", + printf("SizeOfPartitionInfo: %lu PartitionStyle: %u [%s]\n", DiskGeometry.InfoEx.Partition.SizeOfPartitionInfo, DiskGeometry.InfoEx.Partition.PartitionStyle, PARTITION_STYLE_NAME(DiskGeometry.InfoEx.Partition.PartitionStyle));

1 0

[reactos] 02/02: [PARTINFO] Further improvements to the Partition Information Tool.
by Hermès Bélusca-Maïto 08 Jan '21

08 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c087487b1cc2ba72ca5b8… commit c087487b1cc2ba72ca5b8230cbb11e535f8dcd14 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jan 8 01:26:37 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jan 8 01:37:05 2021 +0100 [PARTINFO] Further improvements to the Partition Information Tool. - Migrate all the IOCTL calls to NtDeviceIoControlFile() calls in order to know the actual returned data and Status values. - Add support for displaying information retrieved from: * IOCTL_DISK_GET_DRIVE_GEOMETRY_EX , * IOCTL_DISK_GET_PARTITION_INFO and IOCTL_DISK_GET_PARTITION_INFO_EX for "partition 0" (aka. the whole disk). - Compactify the drive layouts after getting these from IOCTL_DISK_GET_DRIVE_LAYOUT(_EX). - Fix the HexDump() when displaying a buffer whose size is not a multiple of 16. --- .../sysutils/utils/partinfo/partinfo.c | 618 +++++++++++++++------ 1 file changed, 453 insertions(+), 165 deletions(-) diff --git a/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c b/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c index d835e5b713a..38cd7f77549 100644 --- a/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c +++ b/modules/rosapps/applications/sysutils/utils/partinfo/partinfo.c @@ -3,7 +3,7 @@ * 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 + * Copyright 2020-2021 Hermes Belusca-Maito */ /* INCLUDES *****************************************************************/ @@ -15,8 +15,35 @@ #include <windows.h> #include <ntndk.h> +/* The maximum information a DISK_GEOMETRY_EX dynamic structure can contain */ +typedef struct _DISK_GEOMETRY_EX_INTERNAL +{ + DISK_GEOMETRY Geometry; + LARGE_INTEGER DiskSize; + DISK_PARTITION_INFO Partition; + DISK_DETECTION_INFO Detection; +} DISK_GEOMETRY_EX_INTERNAL, *PDISK_GEOMETRY_EX_INTERNAL; + +#define DRIVE_LAYOUT_INFO_ENTRY_SIZE \ + RTL_FIELD_SIZE(DRIVE_LAYOUT_INFORMATION, PartitionEntry[0]) + +#define DRIVE_LAYOUT_INFO_SIZE(n) \ + (FIELD_OFFSET(DRIVE_LAYOUT_INFORMATION, PartitionEntry) + \ + ((n) * DRIVE_LAYOUT_INFO_ENTRY_SIZE)) + +#define DRIVE_LAYOUT_INFOEX_ENTRY_SIZE \ + RTL_FIELD_SIZE(DRIVE_LAYOUT_INFORMATION_EX, PartitionEntry[0]) + +#define DRIVE_LAYOUT_INFOEX_SIZE(n) \ + (FIELD_OFFSET(DRIVE_LAYOUT_INFORMATION_EX, PartitionEntry) + \ + ((n) * DRIVE_LAYOUT_INFOEX_ENTRY_SIZE)) + + +/* Rounding up for number; not the same as ROUND_UP() with power-of-two sizes */ +#define ROUND_UP_NUM(num, up) ((((num) + (up) - 1) / (up)) * (up)) + + // #define DUMP_DATA -#define DUMP_SIZE_INFO /* FORMATTING HELPERS *******************************************************/ @@ -27,6 +54,12 @@ static PCSTR PartitionStyleNames[] = {"MBR", "GPT", "RAW", "Unknown"}; ? PartitionStyleNames[(PartStyle)] \ : PartitionStyleNames[_countof(PartitionStyleNames)-1] ) +static PCSTR DetectTypeNames[] = { "None", "DetectInt13", "DetectExInt13", "Unknown" }; +#define DETECT_TYPE_NAME(DetectType) \ + ( ((DetectType) <= DetectExInt13) \ + ? DetectTypeNames[(DetectType)] \ + : DetectTypeNames[_countof(DetectTypeNames)-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, \ @@ -54,16 +87,20 @@ void HexDump( offset += 16; } - ptr = (PUCHAR)((ULONG_PTR)buffer + offset); - printf("%08lx ", offset); - while (offset < size) + if (offset < size) { - printf(" %02hx", *ptr); - offset++; - ptr++; + ptr = (PUCHAR)((ULONG_PTR)buffer + offset); + printf("%08lx ", offset); + while (offset < size) + { + printf(" %02hx", *ptr); + offset++; + ptr++; + } + printf("\n"); } - printf("\n\n\n"); + printf("\n"); } #endif @@ -77,16 +114,29 @@ int main(int argc, char *argv[]) NTSTATUS Status; ULONG ulDrive; HANDLE hDisk; - DWORD dwRead; - DWORD dwLastError; - DWORD i; + ULONG i; SYSTEM_DEVICE_INFORMATION DeviceInfo; - DISK_GEOMETRY DiskGeometry; + IO_STATUS_BLOCK Iosb; ULONG BufferSize; - PDRIVE_LAYOUT_INFORMATION LayoutBuffer; - PDRIVE_LAYOUT_INFORMATION_EX LayoutBufferEx; + union + { + DISK_GEOMETRY Info; + DISK_GEOMETRY_EX_INTERNAL InfoEx; + } DiskGeometry; + PDISK_GEOMETRY pDiskGeometry; + union + { + PARTITION_INFORMATION Info; + PARTITION_INFORMATION_EX InfoEx; + } PartInfo; + PPARTITION_INFORMATION pPartInfo; + PPARTITION_INFORMATION_EX pPartInfoEx; + union + { + PDRIVE_LAYOUT_INFORMATION Info; + PDRIVE_LAYOUT_INFORMATION_EX InfoEx; + } LayoutBuffer; PVOID ptr; - GUID Guid; WCHAR DriveName[40]; if (argc != 2) @@ -144,90 +194,304 @@ int main(int argc, char *argv[]) return 0; } + printf("Drive number: %lu\n\n", ulDrive); + /* * Get the drive geometry. */ - if (!DeviceIoControl(hDisk, - IOCTL_DISK_GET_DRIVE_GEOMETRY, - NULL, - 0, - &DiskGeometry, - sizeof(DiskGeometry), - &dwRead, - NULL)) + Status = NtDeviceIoControlFile(hDisk, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_DISK_GET_DRIVE_GEOMETRY, + NULL, + 0, + &DiskGeometry.Info, + sizeof(DiskGeometry.Info)); + if (!NT_SUCCESS(Status)) { - printf("DeviceIoControl(IOCTL_DISK_GET_DRIVE_GEOMETRY) failed! Error: %lu\n", - GetLastError()); - CloseHandle(hDisk); - return 0; + printf("NtDeviceIoControlFile(IOCTL_DISK_GET_DRIVE_GEOMETRY) failed! (Status 0x%lx)\n", Status); } + else + { + pDiskGeometry = &DiskGeometry.Info; #ifdef DUMP_DATA - HexDump(&DiskGeometry, dwRead); + HexDump(&DiskGeometry.Info, (ULONG)Iosb.Information); #endif - printf("Drive number: %lu\n\n", ulDrive); + printf("IOCTL_DISK_GET_DRIVE_GEOMETRY\n" + "Cylinders: %I64u\nMediaType: 0x%x\nTracksPerCylinder: %lu\n" + "SectorsPerTrack: %lu\nBytesPerSector: %lu\n", + pDiskGeometry->Cylinders.QuadPart, + pDiskGeometry->MediaType, + pDiskGeometry->TracksPerCylinder, + pDiskGeometry->SectorsPerTrack, + pDiskGeometry->BytesPerSector); + } + + + /* + * Get the extended drive geometry. + */ + printf("\n"); + Status = NtDeviceIoControlFile(hDisk, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, + NULL, + 0, + &DiskGeometry.InfoEx, + sizeof(DiskGeometry.InfoEx)); + if (!NT_SUCCESS(Status)) + { + printf("NtDeviceIoControlFile(IOCTL_DISK_GET_DRIVE_GEOMETRY_EX) failed! (Status 0x%lx)\n", Status); + } + else + { + // PDISK_DETECTION_INFO DiskDetectInfo = &DiskGeometry.InfoEx.Detection; // DiskGeometryGetDetect(&DiskGeometry.InfoEx); + // PDISK_PARTITION_INFO DiskPartInfo = &DiskGeometry.InfoEx.Partition; // DiskGeometryGetPartition(&DiskGeometry.InfoEx); + pDiskGeometry = &DiskGeometry.InfoEx.Geometry; + +#ifdef DUMP_DATA + HexDump(&DiskGeometry.InfoEx, (ULONG)Iosb.Information); +#endif + printf("IOCTL_DISK_GET_DRIVE_GEOMETRY_EX\n" + "Cylinders: %I64u\nMediaType: 0x%x\nTracksPerCylinder: %lu\n" + "SectorsPerTrack: %lu\nBytesPerSector: %lu\n" + "DiskSize: %I64u\n", + pDiskGeometry->Cylinders.QuadPart, + pDiskGeometry->MediaType, + pDiskGeometry->TracksPerCylinder, + pDiskGeometry->SectorsPerTrack, + pDiskGeometry->BytesPerSector, + DiskGeometry.InfoEx.DiskSize.QuadPart); + + printf("SizeOfDetectInfo: %lu DetectionType: %lu (%s)\n", + DiskGeometry.InfoEx.Detection.SizeOfDetectInfo, + DiskGeometry.InfoEx.Detection.DetectionType, + DETECT_TYPE_NAME(DiskGeometry.InfoEx.Detection.DetectionType)); + switch (DiskGeometry.InfoEx.Detection.DetectionType) + { + case DetectInt13: + { + PDISK_INT13_INFO pInt13 = &DiskGeometry.InfoEx.Detection.Int13; + printf(" DriveSelect: %u MaxCylinders: %lu SectorsPerTrack: %u MaxHeads: %u NumberDrives: %u\n", + pInt13->DriveSelect, pInt13->MaxCylinders, + pInt13->SectorsPerTrack, pInt13->MaxHeads, + pInt13->NumberDrives); + break; + } + + case DetectExInt13: + { + PDISK_EX_INT13_INFO pExInt13 = &DiskGeometry.InfoEx.Detection.ExInt13; + printf(" ExBufferSize: %u ExFlags: %u\n" + " ExCylinders: %lu ExHeads: %lu ExSectorsPerTrack: %lu\n" + " ExSectorsPerDrive: %I64u ExSectorSize: %u ExReserved: %u\n", + pExInt13->ExBufferSize, pExInt13->ExFlags, + pExInt13->ExCylinders, pExInt13->ExHeads, + pExInt13->ExSectorsPerTrack, pExInt13->ExSectorsPerDrive, + pExInt13->ExSectorSize, pExInt13->ExReserved); + break; + } + + case DetectNone: + default: + break; + } + + printf("SizeOfPartitionInfo: %lu PartitionStyle: %lu [%s]\n", + DiskGeometry.InfoEx.Partition.SizeOfPartitionInfo, + DiskGeometry.InfoEx.Partition.PartitionStyle, + PARTITION_STYLE_NAME(DiskGeometry.InfoEx.Partition.PartitionStyle)); + + if (DiskGeometry.InfoEx.Partition.PartitionStyle == PARTITION_STYLE_MBR) + { + printf(" Signature: 0x%08lx Checksum 0x%08lx\n", + DiskGeometry.InfoEx.Partition.Mbr.Signature, + DiskGeometry.InfoEx.Partition.Mbr.CheckSum); + } + else if (DiskGeometry.InfoEx.Partition.PartitionStyle == PARTITION_STYLE_GPT) + { + printf(" DiskId: {" GUID_FORMAT_STR "}\n", + GUID_ELEMENTS(&DiskGeometry.InfoEx.Partition.Gpt.DiskId)); + } + else + { + /* Unknown */ + printf("\n"); + } + } - 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, - DiskGeometry.TracksPerCylinder, - DiskGeometry.SectorsPerTrack, - DiskGeometry.BytesPerSector); - -#if 0 // TODO! - /* Get extended drive geometry */ - // IOCTL_DISK_GET_DRIVE_GEOMETRY_EX + + /* + * Display partition 0 (i.e. the whole disk) information. + */ + printf("\n"); + Status = NtDeviceIoControlFile(hDisk, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_DISK_GET_PARTITION_INFO, + NULL, + 0, + &PartInfo.Info, + sizeof(PartInfo.Info)); + if (!NT_SUCCESS(Status)) + { + printf("NtDeviceIoControlFile(IOCTL_DISK_GET_PARTITION_INFO) failed! (Status 0x%lx)\n", Status); + } + else + { + pPartInfo = &PartInfo.Info; + +#ifdef DUMP_DATA + HexDump(&PartInfo.Info, (ULONG)Iosb.Information); #endif + printf("IOCTL_DISK_GET_PARTITION_INFO\n" + "nr: %ld boot: %1x type: 0x%x (%s) start: 0x%016I64x count: 0x%016I64x hidden: 0x%lx\n", + pPartInfo->PartitionNumber, + pPartInfo->BootIndicator, + pPartInfo->PartitionType, + pPartInfo->RecognizedPartition ? "Recognized" : "Not recognized", + pPartInfo->StartingOffset.QuadPart, + pPartInfo->PartitionLength.QuadPart, + pPartInfo->HiddenSectors); + } + + printf("\n"); + Status = NtDeviceIoControlFile(hDisk, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_DISK_GET_PARTITION_INFO_EX, + NULL, + 0, + &PartInfo.InfoEx, + sizeof(PartInfo.InfoEx)); + if (!NT_SUCCESS(Status)) + { + printf("NtDeviceIoControlFile(IOCTL_DISK_GET_PARTITION_INFO_EX) failed! (Status 0x%lx)\n", Status); + } + else + { + pPartInfoEx = &PartInfo.InfoEx; + +#ifdef DUMP_DATA + HexDump(&PartInfo.InfoEx, (ULONG)Iosb.Information); +#endif + printf("IOCTL_DISK_GET_PARTITION_INFO_EX\n"); + + if (pPartInfoEx->PartitionStyle == PARTITION_STYLE_MBR) + { + printf("nr: %ld [%s] boot: %1x type: 0x%x (%s) start: 0x%016I64x count: 0x%016I64x hidden: 0x%lx\n", + pPartInfoEx->PartitionNumber, + PARTITION_STYLE_NAME(pPartInfoEx->PartitionStyle), + pPartInfoEx->Mbr.BootIndicator, + pPartInfoEx->Mbr.PartitionType, + pPartInfoEx->Mbr.RecognizedPartition ? "Recognized" : "Not recognized", + pPartInfoEx->StartingOffset.QuadPart, + pPartInfoEx->PartitionLength.QuadPart, + pPartInfoEx->Mbr.HiddenSectors); +#if (NTDDI_VERSION >= NTDDI_WINBLUE) + printf(" PartitionId: {" GUID_FORMAT_STR "}\n", + GUID_ELEMENTS(&pPartInfoEx->Mbr.PartitionId)); +#endif + } + else if (pPartInfoEx->PartitionStyle == PARTITION_STYLE_GPT) + { + printf("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", + pPartInfoEx->PartitionNumber, + PARTITION_STYLE_NAME(pPartInfoEx->PartitionStyle), + GUID_ELEMENTS(&pPartInfoEx->Gpt.PartitionType), + GUID_ELEMENTS(&pPartInfoEx->Gpt.PartitionId), + pPartInfoEx->Gpt.Attributes, + (int)_countof(pPartInfoEx->Gpt.Name), + pPartInfoEx->Gpt.Name, + pPartInfoEx->StartingOffset.QuadPart, + pPartInfoEx->PartitionLength.QuadPart); + } + } /* * Retrieve the legacy partition layout */ + printf("\n"); - /* 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) + /* Allocate a layout buffer with initially 4 partition entries (or 16 for NEC PC-98) */ + BufferSize = DRIVE_LAYOUT_INFO_SIZE(IsNEC_98 ? 16 : 4); + LayoutBuffer.Info = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + BufferSize); + if (!LayoutBuffer.Info) { printf("Out of memory!"); - CloseHandle(hDisk); - return 0; + goto Quit; } - memset(LayoutBuffer, 0, BufferSize); - /* Keep looping while the drive layout buffer is too small */ + /* + * Keep looping while the drive layout buffer is too small. + * Iosb.Information or PartitionCount only contain actual info only + * once NtDeviceIoControlFile(IOCTL_DISK_GET_DRIVE_LAYOUT) succeeds. + */ for (;;) { - if (DeviceIoControl(hDisk, - IOCTL_DISK_GET_DRIVE_LAYOUT, - NULL, - 0, - LayoutBuffer, - BufferSize, - &dwRead, - NULL)) + Status = NtDeviceIoControlFile(hDisk, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_DISK_GET_DRIVE_LAYOUT, + NULL, + 0, + LayoutBuffer.Info, + BufferSize); + if (NT_SUCCESS(Status)) { - dwLastError = ERROR_SUCCESS; + /* We succeeded; compactify the layout structure but keep the + * number of partition entries rounded up to a multiple of 4. */ +#if 1 + BufferSize = DRIVE_LAYOUT_INFO_SIZE(ROUND_UP_NUM(LayoutBuffer.Info->PartitionCount, 4)); +#else + BufferSize = (ULONG)Iosb.Information; +#endif + ptr = RtlReAllocateHeap(RtlGetProcessHeap(), + HEAP_REALLOC_IN_PLACE_ONLY, + LayoutBuffer.Info, BufferSize); + if (!ptr) + { + printf("Compactification failed; keeping original structure.\n"); + } + else + { + LayoutBuffer.Info = ptr; + } + Status = STATUS_SUCCESS; break; } - dwLastError = GetLastError(); - if (dwLastError != ERROR_INSUFFICIENT_BUFFER) + if (Status != STATUS_BUFFER_TOO_SMALL) { - printf("DeviceIoControl(IOCTL_DISK_GET_DRIVE_LAYOUT) failed! Error: %lu\n", - dwLastError); + printf("NtDeviceIoControlFile(IOCTL_DISK_GET_DRIVE_LAYOUT) failed! (Status 0x%lx)\n", Status); /* 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) + if (Status != STATUS_INVALID_DEVICE_REQUEST) { - free(LayoutBuffer); - CloseHandle(hDisk); - return 0; + RtlFreeHeap(RtlGetProcessHeap(), 0, LayoutBuffer.Info); + goto Quit; } else { @@ -236,45 +500,46 @@ int main(int argc, char *argv[]) } } - /* Reallocate the buffer */ - BufferSize += 4 * sizeof(PARTITION_INFORMATION); - ptr = realloc(LayoutBuffer, BufferSize); + /* Reallocate the buffer by chunks of 4 entries */ + BufferSize += 4 * DRIVE_LAYOUT_INFO_ENTRY_SIZE; + ptr = RtlReAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + LayoutBuffer.Info, BufferSize); if (!ptr) { printf("Out of memory!"); - free(LayoutBuffer); - CloseHandle(hDisk); - return 0; + RtlFreeHeap(RtlGetProcessHeap(), 0, LayoutBuffer.Info); + goto Quit; } - LayoutBuffer = ptr; - memset(LayoutBuffer, 0, BufferSize); + LayoutBuffer.Info = ptr; } - if (dwLastError == ERROR_SUCCESS) + if (Status == STATUS_SUCCESS) { #ifdef DUMP_DATA - HexDump(LayoutBuffer, dwRead); + HexDump(LayoutBuffer.Info, (ULONG)Iosb.Information); #endif - printf("IOCTL_DISK_GET_DRIVE_LAYOUT\n" "Partitions: %lu Signature: 0x%08lx\n", - LayoutBuffer->PartitionCount, - LayoutBuffer->Signature); + LayoutBuffer.Info->PartitionCount, + LayoutBuffer.Info->Signature); - for (i = 0; i < LayoutBuffer->PartitionCount; i++) + for (i = 0; i < LayoutBuffer.Info->PartitionCount; i++) { - printf(" %ld: nr: %ld boot: %1x type: %x start: 0x%016I64x count: 0x%016I64x hidden: 0x%lx\n", + pPartInfo = &LayoutBuffer.Info->PartitionEntry[i]; + + printf(" %ld: nr: %ld boot: %1x type: 0x%x (%s) 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); + pPartInfo->PartitionNumber, + pPartInfo->BootIndicator, + pPartInfo->PartitionType, + pPartInfo->RecognizedPartition ? "Recognized" : "Not recognized", + pPartInfo->StartingOffset.QuadPart, + pPartInfo->PartitionLength.QuadPart, + pPartInfo->HiddenSectors); } - - free(LayoutBuffer); } + RtlFreeHeap(RtlGetProcessHeap(), 0, LayoutBuffer.Info); /* @@ -282,46 +547,67 @@ int main(int argc, char *argv[]) */ 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) + /* Allocate a layout buffer with initially 4 partition entries (or 16 for NEC PC-98) */ + BufferSize = DRIVE_LAYOUT_INFOEX_SIZE(IsNEC_98 ? 16 : 4); + LayoutBuffer.InfoEx = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + BufferSize); + if (!LayoutBuffer.InfoEx) { printf("Out of memory!"); - CloseHandle(hDisk); - return 0; + goto Quit; } - memset(LayoutBufferEx, 0, BufferSize); - /* Keep looping while the drive layout buffer is too small */ + /* + * Keep looping while the drive layout buffer is too small. + * Iosb.Information or PartitionCount only contain actual info only + * once NtDeviceIoControlFile(IOCTL_DISK_GET_DRIVE_LAYOUT_EX) succeeds. + */ for (;;) { - if (DeviceIoControl(hDisk, - IOCTL_DISK_GET_DRIVE_LAYOUT_EX, - NULL, - 0, - LayoutBufferEx, - BufferSize, - &dwRead, - NULL)) + Status = NtDeviceIoControlFile(hDisk, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_DISK_GET_DRIVE_LAYOUT_EX, + NULL, + 0, + LayoutBuffer.InfoEx, + BufferSize); + if (NT_SUCCESS(Status)) { - dwLastError = ERROR_SUCCESS; + /* We succeeded; compactify the layout structure but keep the + * number of partition entries rounded up to a multiple of 4. */ +#if 1 + BufferSize = DRIVE_LAYOUT_INFOEX_SIZE(ROUND_UP_NUM(LayoutBuffer.InfoEx->PartitionCount, 4)); +#else + BufferSize = (ULONG)Iosb.Information; +#endif + ptr = RtlReAllocateHeap(RtlGetProcessHeap(), + HEAP_REALLOC_IN_PLACE_ONLY, + LayoutBuffer.InfoEx, BufferSize); + if (!ptr) + { + printf("Compactification failed; keeping original structure.\n"); + } + else + { + LayoutBuffer.InfoEx = ptr; + } + Status = STATUS_SUCCESS; break; } - dwLastError = GetLastError(); - if (dwLastError != ERROR_INSUFFICIENT_BUFFER) + if (Status != STATUS_BUFFER_TOO_SMALL) { - printf("DeviceIoControl(IOCTL_DISK_GET_DRIVE_LAYOUT_EX) failed! Error: %lu\n", - dwLastError); + printf("NtDeviceIoControlFile(IOCTL_DISK_GET_DRIVE_LAYOUT_EX) failed! (Status 0x%lx)\n", Status); /* Bail out if any other error than "invalid function" has been emitted */ - if (dwLastError != ERROR_INVALID_FUNCTION) + if (Status != STATUS_INVALID_DEVICE_REQUEST) { - free(LayoutBufferEx); - CloseHandle(hDisk); - return 0; + RtlFreeHeap(RtlGetProcessHeap(), 0, LayoutBuffer.InfoEx); + goto Quit; } else { @@ -330,74 +616,77 @@ int main(int argc, char *argv[]) } } - /* Reallocate the buffer */ - BufferSize += 4 * sizeof(PARTITION_INFORMATION_EX); - ptr = realloc(LayoutBufferEx, BufferSize); + /* Reallocate the buffer by chunks of 4 entries */ + BufferSize += 4 * DRIVE_LAYOUT_INFOEX_ENTRY_SIZE; + ptr = RtlReAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + LayoutBuffer.InfoEx, BufferSize); if (!ptr) { printf("Out of memory!"); - free(LayoutBufferEx); - CloseHandle(hDisk); - return 0; + RtlFreeHeap(RtlGetProcessHeap(), 0, LayoutBuffer.InfoEx); + goto Quit; } - LayoutBufferEx = ptr; - memset(LayoutBufferEx, 0, BufferSize); + LayoutBuffer.InfoEx = ptr; } - if (dwLastError == ERROR_SUCCESS) + if (Status == STATUS_SUCCESS) { #ifdef DUMP_DATA - HexDump(LayoutBufferEx, dwRead); + HexDump(LayoutBuffer.InfoEx, (ULONG)Iosb.Information); #endif - printf("IOCTL_DISK_GET_DRIVE_LAYOUT_EX\n" - "PartitionStyle: [%s]\n", - PARTITION_STYLE_NAME(LayoutBufferEx->PartitionStyle)); + "PartitionStyle: %lu [%s]\n", + LayoutBuffer.InfoEx->PartitionStyle, + PARTITION_STYLE_NAME(LayoutBuffer.InfoEx->PartitionStyle)); - if (LayoutBufferEx->PartitionStyle == PARTITION_STYLE_MBR) + if (LayoutBuffer.InfoEx->PartitionStyle == PARTITION_STYLE_MBR) { printf("Partitions: %lu Signature: 0x%08lx", - LayoutBufferEx->PartitionCount, - LayoutBufferEx->Mbr.Signature); + LayoutBuffer.InfoEx->PartitionCount, + LayoutBuffer.InfoEx->Mbr.Signature); #if (NTDDI_VERSION >= NTDDI_WIN10_RS1) printf(" Checksum 0x%08lx\n", - LayoutBufferEx->Mbr.CheckSum); + LayoutBuffer.InfoEx->Mbr.CheckSum); #else printf("\n"); #endif - for (i = 0; i < LayoutBufferEx->PartitionCount; i++) + for (i = 0; i < LayoutBuffer.InfoEx->PartitionCount; i++) { - printf(" %ld: nr: %ld [%s] boot: %1x type: %x start: 0x%016I64x count: 0x%016I64x hidden: 0x%lx\n", + pPartInfoEx = &LayoutBuffer.InfoEx->PartitionEntry[i]; + + printf(" %ld: nr: %ld [%s] boot: %1x type: 0x%x (%s) 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); + pPartInfoEx->PartitionNumber, + PARTITION_STYLE_NAME(pPartInfoEx->PartitionStyle), + pPartInfoEx->Mbr.BootIndicator, + pPartInfoEx->Mbr.PartitionType, + pPartInfoEx->Mbr.RecognizedPartition ? "Recognized" : "Not recognized", + pPartInfoEx->StartingOffset.QuadPart, + pPartInfoEx->PartitionLength.QuadPart, + pPartInfoEx->Mbr.HiddenSectors); #if (NTDDI_VERSION >= NTDDI_WINBLUE) - Guid = LayoutBufferEx->PartitionEntry[i].Mbr.PartitionId; printf(" PartitionId: {" GUID_FORMAT_STR "}\n", - GUID_ELEMENTS(&Guid)); + GUID_ELEMENTS(&pPartInfoEx->Mbr.PartitionId)); #endif } } - else if (LayoutBufferEx->PartitionStyle == PARTITION_STYLE_GPT) + else if (LayoutBuffer.InfoEx->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); + LayoutBuffer.InfoEx->PartitionCount, + LayoutBuffer.InfoEx->Gpt.MaxPartitionCount, + GUID_ELEMENTS(&LayoutBuffer.InfoEx->Gpt.DiskId), + LayoutBuffer.InfoEx->Gpt.StartingUsableOffset.QuadPart, + LayoutBuffer.InfoEx->Gpt.UsableLength.QuadPart); - for (i = 0; i < LayoutBufferEx->PartitionCount; i++) + for (i = 0; i < LayoutBuffer.InfoEx->PartitionCount; i++) { + pPartInfoEx = &LayoutBuffer.InfoEx->PartitionEntry[i]; + printf(" %ld: nr: %ld [%s]\n" " type : {" GUID_FORMAT_STR "}\n" " id : {" GUID_FORMAT_STR "}\n" @@ -405,22 +694,21 @@ int main(int argc, char *argv[]) " 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, - (int)_countof(LayoutBufferEx->PartitionEntry[i].Gpt.Name), - LayoutBufferEx->PartitionEntry[i].Gpt.Name, - LayoutBufferEx->PartitionEntry[i].StartingOffset.QuadPart, - LayoutBufferEx->PartitionEntry[i].PartitionLength.QuadPart); + pPartInfoEx->PartitionNumber, + PARTITION_STYLE_NAME(pPartInfoEx->PartitionStyle), + GUID_ELEMENTS(&pPartInfoEx->Gpt.PartitionType), + GUID_ELEMENTS(&pPartInfoEx->Gpt.PartitionId), + pPartInfoEx->Gpt.Attributes, + (int)_countof(pPartInfoEx->Gpt.Name), + pPartInfoEx->Gpt.Name, + pPartInfoEx->StartingOffset.QuadPart, + pPartInfoEx->PartitionLength.QuadPart); } } - - free(LayoutBufferEx); } + RtlFreeHeap(RtlGetProcessHeap(), 0, LayoutBuffer.InfoEx); +Quit: CloseHandle(hDisk); - return 0; }

1 0

[reactos] 01/02: [PSDK] Add missing PPARTITION_INFORMATION_GPT, PPARTITION_INFORMATION_MBR, PPARTITION_INFORMATION_EX definitions.
by Hermès Bélusca-Maïto 08 Jan '21

08 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a6ed59156b1555653789… commit 8a6ed59156b155565378972a018178913a15849b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jan 7 21:15:04 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jan 8 01:36:58 2021 +0100 [PSDK] Add missing PPARTITION_INFORMATION_GPT, PPARTITION_INFORMATION_MBR, PPARTITION_INFORMATION_EX definitions. Addendum to commit 7ae3d530. --- sdk/include/psdk/winioctl.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/sdk/include/psdk/winioctl.h b/sdk/include/psdk/winioctl.h index b0061baf42e..8debea1f5d7 100644 --- a/sdk/include/psdk/winioctl.h +++ b/sdk/include/psdk/winioctl.h @@ -294,7 +294,7 @@ typedef enum _MEDIA_TYPE { F3_200Mb_512, F3_240M_512, F3_32M_512 -} MEDIA_TYPE,*PMEDIA_TYPE; +} MEDIA_TYPE, *PMEDIA_TYPE; typedef struct _DISK_GEOMETRY { LARGE_INTEGER Cylinders; @@ -302,7 +302,7 @@ typedef struct _DISK_GEOMETRY { DWORD TracksPerCylinder; DWORD SectorsPerTrack; DWORD BytesPerSector; -} DISK_GEOMETRY,*PDISK_GEOMETRY; +} DISK_GEOMETRY, *PDISK_GEOMETRY; typedef struct _PARTITION_INFORMATION { LARGE_INTEGER StartingOffset; LARGE_INTEGER PartitionLength; @@ -312,7 +312,7 @@ typedef struct _PARTITION_INFORMATION { BOOLEAN BootIndicator; BOOLEAN RecognizedPartition; BOOLEAN RewritePartition; -} PARTITION_INFORMATION,*PPARTITION_INFORMATION; +} PARTITION_INFORMATION, *PPARTITION_INFORMATION; typedef struct _DRIVE_LAYOUT_INFORMATION { DWORD PartitionCount; DWORD Signature; @@ -320,7 +320,7 @@ typedef struct _DRIVE_LAYOUT_INFORMATION { } DRIVE_LAYOUT_INFORMATION, *PDRIVE_LAYOUT_INFORMATION; typedef struct _SET_PARTITION_INFORMATION { BYTE PartitionType; -} SET_PARTITION_INFORMATION,*PSET_PARTITION_INFORMATION; +} SET_PARTITION_INFORMATION, *PSET_PARTITION_INFORMATION; #if (_WIN32_WINNT >= 0x0500) /* Actually it should be > 0x0500, since this is not present in Windows 2000; @@ -335,17 +335,17 @@ typedef enum _PARTITION_STYLE { typedef struct _CREATE_DISK_GPT { GUID DiskId; DWORD MaxPartitionCount; -} CREATE_DISK_GPT,*PCREATE_DISK_GPT; +} CREATE_DISK_GPT, *PCREATE_DISK_GPT; typedef struct _CREATE_DISK_MBR { DWORD Signature; -} CREATE_DISK_MBR,*PCREATE_DISK_MBR; +} CREATE_DISK_MBR, *PCREATE_DISK_MBR; typedef struct _CREATE_DISK { PARTITION_STYLE PartitionStyle; _ANONYMOUS_UNION union { CREATE_DISK_MBR Mbr; CREATE_DISK_GPT Gpt; }; -} CREATE_DISK,*PCREATE_DISK; +} CREATE_DISK, *PCREATE_DISK; typedef enum _DETECTION_TYPE { DetectNone, @@ -358,7 +358,7 @@ typedef struct _DISK_INT13_INFO { WORD SectorsPerTrack; WORD MaxHeads; WORD NumberDrives; -} DISK_INT13_INFO,*PDISK_INT13_INFO; +} DISK_INT13_INFO, *PDISK_INT13_INFO; typedef struct _DISK_EX_INT13_INFO { WORD ExBufferSize; WORD ExFlags; @@ -368,7 +368,7 @@ typedef struct _DISK_EX_INT13_INFO { DWORD64 ExSectorsPerDrive; WORD ExSectorSize; WORD ExReserved; -} DISK_EX_INT13_INFO,*PDISK_EX_INT13_INFO; +} DISK_EX_INT13_INFO, *PDISK_EX_INT13_INFO; typedef struct _DISK_DETECTION_INFO { DWORD SizeOfDetectInfo; DETECTION_TYPE DetectionType; @@ -378,7 +378,7 @@ typedef struct _DISK_DETECTION_INFO { DISK_EX_INT13_INFO ExInt13; }; }; -} DISK_DETECTION_INFO,*PDISK_DETECTION_INFO; +} DISK_DETECTION_INFO, *PDISK_DETECTION_INFO; typedef struct _DISK_PARTITION_INFO { DWORD SizeOfPartitionInfo; PARTITION_STYLE PartitionStyle; @@ -391,12 +391,12 @@ typedef struct _DISK_PARTITION_INFO { GUID DiskId; } Gpt; }; -} DISK_PARTITION_INFO,*PDISK_PARTITION_INFO; +} DISK_PARTITION_INFO, *PDISK_PARTITION_INFO; typedef struct _DISK_GEOMETRY_EX { DISK_GEOMETRY Geometry; LARGE_INTEGER DiskSize; BYTE Data[1]; -} DISK_GEOMETRY_EX,*PDISK_GEOMETRY_EX; +} DISK_GEOMETRY_EX, *PDISK_GEOMETRY_EX; #if (NTDDI_VERSION < NTDDI_WS03) #define DiskGeometryGetPartition(Geometry) \ @@ -419,13 +419,13 @@ typedef struct _PARTITION_INFORMATION_GPT { GUID PartitionId; DWORD64 Attributes; WCHAR Name[36]; -} PARTITION_INFORMATION_GPT; +} PARTITION_INFORMATION_GPT, *PPPARTITION_INFORMATION_GPT; typedef struct _PARTITION_INFORMATION_MBR { BYTE PartitionType; BOOLEAN BootIndicator; BOOLEAN RecognizedPartition; DWORD HiddenSectors; -} PARTITION_INFORMATION_MBR; +} PARTITION_INFORMATION_MBR, *PPARTITION_INFORMATION_MBR; typedef struct _PARTITION_INFORMATION_EX { PARTITION_STYLE PartitionStyle; LARGE_INTEGER StartingOffset; @@ -439,14 +439,14 @@ typedef struct _PARTITION_INFORMATION_EX { PARTITION_INFORMATION_MBR Mbr; PARTITION_INFORMATION_GPT Gpt; }; -} PARTITION_INFORMATION_EX; +} PARTITION_INFORMATION_EX, *PPARTITION_INFORMATION_EX; typedef struct _DRIVE_LAYOUT_INFORMATION_GPT { GUID DiskId; LARGE_INTEGER StartingUsableOffset; LARGE_INTEGER UsableLength; DWORD MaxPartitionCount; -} DRIVE_LAYOUT_INFORMATION_GPT,*PDRIVE_LAYOUT_INFORMATION_GPT; +} DRIVE_LAYOUT_INFORMATION_GPT, *PDRIVE_LAYOUT_INFORMATION_GPT; typedef struct _DRIVE_LAYOUT_INFORMATION_MBR { DWORD Signature; #if (NTDDI_VERSION >= NTDDI_WIN10_RS1) @@ -461,7 +461,7 @@ typedef struct _DRIVE_LAYOUT_INFORMATION_EX { DRIVE_LAYOUT_INFORMATION_GPT Gpt; }; PARTITION_INFORMATION_EX PartitionEntry[1]; -} DRIVE_LAYOUT_INFORMATION_EX,*PDRIVE_LAYOUT_INFORMATION_EX; +} DRIVE_LAYOUT_INFORMATION_EX, *PDRIVE_LAYOUT_INFORMATION_EX; typedef SET_PARTITION_INFORMATION SET_PARTITION_INFORMATION_MBR; typedef PARTITION_INFORMATION_GPT SET_PARTITION_INFORMATION_GPT;

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