Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MSPAINT] Update Turkish (tr-TR) translation (#7371)
by Mahir Gül 25 Sep '24

25 Sep '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=064d6d3427eef07c3b47c… commit 064d6d3427eef07c3b47c9ffb30e1058241f6147 Author: Mahir Gül <mahirgul(a)gmail.com> AuthorDate: Thu Sep 26 00:12:19 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 26 00:12:19 2024 +0200 [MSPAINT] Update Turkish (tr-TR) translation (#7371) --- base/applications/mspaint/lang/tr-TR.rc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index 7030caf87b6..911eeabf84a 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -4,6 +4,7 @@ * PURPOSE: Turkish resource file * TRANSLATORS: Copyright 2013-2016, 2019 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net> * Copyright 2021-2022 Süleyman Poyraz <zaryob.dev(a)gmail.com> + * Copyright 2024 Mahir Gül <mahirgul(a)gmail.com> */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -269,8 +270,8 @@ BEGIN IDS_UNDERLINE "Altı Çizgili" IDS_VERTICAL "Düşey" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." - IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" - IDS_CANTSENDMAIL "Failed to send a mail." - IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" + IDS_CANTPASTE "Panodan yapıştırma işlemi başarısız oldu. Veri biçimi ya yanlış ya da desteklenmiyor." + IDS_SAVEERROR "Bit eşlemi dosyaya kaydedilemedi:\n\n%s" + IDS_CANTSENDMAIL "Posta gönderilemedi." + IDS_LOSECOLOR "Bu işlem sırasında renk bilgisi kaybolacaktır. Devam edeceğinizden emin misiniz?" END

1 0

[reactos] 01/01: [MATRIX] Improve Romanian (ro-RO) translation (#7362)
by Andrei Miloiu 25 Sep '24

25 Sep '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9acaefc3b004dac6aa9b1… commit 9acaefc3b004dac6aa9b1753f9f0ed9bd1cae38f Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Wed Sep 25 16:25:11 2024 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 25 15:25:11 2024 +0200 [MATRIX] Improve Romanian (ro-RO) translation (#7362) --- modules/rosapps/applications/screensavers/matrix/lang/ro-RO.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rosapps/applications/screensavers/matrix/lang/ro-RO.rc b/modules/rosapps/applications/screensavers/matrix/lang/ro-RO.rc index 9ce3fe28234..96f32047208 100644 --- a/modules/rosapps/applications/screensavers/matrix/lang/ro-RO.rc +++ b/modules/rosapps/applications/screensavers/matrix/lang/ro-RO.rc @@ -14,7 +14,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDD_CONFIG DIALOGEX DISCARDABLE 0, 0, 340, 183 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configurare a economizorului de ecran Matrix" +CAPTION "Setări pentru economizorul de ecran Matrix" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "&Viteza de decodificare",IDC_STATIC,7,7,128,36

1 0

[reactos] 05/05: [FREELDR] i386/pc/pcdisk.c: Fix LBA reads retry loop (#7367)
by Hermès Bélusca-Maïto 25 Sep '24

25 Sep '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=840d39b9d09a1bce487c6… commit 840d39b9d09a1bce487c651e880049ee577cf8be Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 22 21:37:36 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 25 13:24:08 2024 +0200 [FREELDR] i386/pc/pcdisk.c: Fix LBA reads retry loop (#7367) When the Int 13h AH=42h "Extended read" function fails, the disk address packet's LBA block count is reset to the number of blocks that have been successfully transferred. This is more or less fine, unless one wants to ensure the exact number of sectors gets read. If the function fails so that zero sectors were read, the retry loop is restarted, but with the packet's LBA block count member reset, as per the documentation. (In this example, it is reset to zero.) Then, at the next retry attempt, zero sectors are requested to be read, and this time of course, the call succeeds... Wrongly, of course, this is not what's expected. Therefore, for each retry, the LBA block count member should be set again to the correct number of sectors to read. There are maximum 3 retries, so the retry loop will stop anyway, but the LBA read will now correctly fail and return FALSE, as expected. This problem doesn't exist in the retry loop for the Int 13h, AH=02h "Read Disk Sectors" CHS function, because here, the call is made only using registers, and we use a pair of RegsIn/RegsOut. RegsOut receives the modified register values, but the input RegsIn stays unchanged. --- boot/freeldr/freeldr/arch/i386/pc/pcdisk.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c b/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c index 40492457c86..28e7fd66a76 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c +++ b/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c @@ -570,14 +570,13 @@ PcDiskReadLogicalSectorsLBA( RtlZeroMemory(Packet, sizeof(*Packet)); Packet->PacketSize = sizeof(*Packet); Packet->Reserved = 0; - Packet->LBABlockCount = (USHORT)SectorCount; - ASSERT(Packet->LBABlockCount == SectorCount); + // Packet->LBABlockCount set in the loop. Packet->TransferBufferOffset = ((ULONG_PTR)Buffer) & 0x0F; Packet->TransferBufferSegment = (USHORT)(((ULONG_PTR)Buffer) >> 4); Packet->LBAStartBlock = SectorNumber; /* - * BIOS int 0x13, function 42h - IBM/MS INT 13 Extensions - EXTENDED READ + * BIOS Int 13h, function 42h - IBM/MS INT 13 Extensions - EXTENDED READ * Return: * CF clear if successful * AH = 00h @@ -586,7 +585,7 @@ PcDiskReadLogicalSectorsLBA( * Disk address packet's block count field set to the * number of blocks successfully transferred. */ - RegsIn.b.ah = 0x42; // Subfunction 42h + RegsIn.b.ah = 0x42; RegsIn.b.dl = DriveNumber; // Drive number in DL (0 - floppy, 0x80 - harddisk) RegsIn.x.ds = BIOSCALLBUFSEGMENT; // DS:SI -> disk address packet RegsIn.w.si = BIOSCALLBUFOFFSET; @@ -594,6 +593,12 @@ PcDiskReadLogicalSectorsLBA( /* Retry 3 times */ for (RetryCount = 0; RetryCount < 3; ++RetryCount) { + /* Restore the number of blocks to transfer, since it gets reset + * on failure with the number of blocks that were successfully + * transferred (and which could be zero). */ + Packet->LBABlockCount = (USHORT)SectorCount; + ASSERT(Packet->LBABlockCount == SectorCount); + Int386(0x13, &RegsIn, &RegsOut); /* If it worked return TRUE */

1 0

[reactos] 04/05: [FREELDR] Fix the seg:off values when dumping the extended drive parameters (#7367)
by Hermès Bélusca-Maïto 25 Sep '24

25 Sep '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4190b4892448cd73574c0… commit 4190b4892448cd73574c0886cc189a2a8e106b5a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 22 19:00:42 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 25 13:05:07 2024 +0200 [FREELDR] Fix the seg:off values when dumping the extended drive parameters (#7367) (By the way, it's "EDD": "Enhanced Disk Drive", not "EED"...) The 13th and 14th USHORTs (at offsets 0x1A-0x1D) in the retrieved buffer from the INT 13h, AH=48h "Get Extended Drive Parameters" function, correspond respectively to the offset and the segment of the "EDD configuration parameters", see http://www.ctyme.com/intr/rb-0715.htm Fixes code introduced in commit b3f11cfb38 (r17484). ---- 16 years ago, these values were wrongly stored in the returned buffer by VirtualBox, see https://www.virtualbox.org/ticket/2848 . This has been fixed since VBox 2.1.0 in commit 15712 (22 Dec. 2008): https://www.virtualbox.org/changeset/15712/vbox This problem was also noticed earlier (07 Mar. 2008) and fixed in Xen: https://lists.xenproject.org/archives/html/xen-devel/2008-03/msg00229.html This bug originated from Bochs, from which the two projects above adapted their rombios.c code. It was fixed on 08-09 Oct. 2007 by Myles Watson, see https://sourceforge.net/p/bochs/mailman/message/13777090/ and included in Bochs 1.15x and 1.185+ https://sourceforge.net/p/bochs/mailman/message/12953093/ https://sourceforge.net/p/bochs/mailman/message/12953094/ --- boot/freeldr/freeldr/arch/i386/pc/pcdisk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c b/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c index 550c424d15d..40492457c86 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c +++ b/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c @@ -338,14 +338,15 @@ DiskGetExtendedDriveParameters( TRACE("number of physical cylinders on drive: %u\n", *(PULONG)&Ptr[2]); TRACE("number of physical heads on drive: %u\n", *(PULONG)&Ptr[4]); TRACE("number of physical sectors per track: %u\n", *(PULONG)&Ptr[6]); - TRACE("total number of sectors on drive: %I64u\n", *(unsigned long long*)&Ptr[8]); + TRACE("total number of sectors on drive: %I64u\n", *(PULONGLONG)&Ptr[8]); TRACE("bytes per sector: %u\n", Ptr[12]); if (Ptr[0] >= 0x1e) { - TRACE("EED configuration parameters: %x:%x\n", Ptr[13], Ptr[14]); + // Ptr[13]: offset, Ptr[14]: segment + TRACE("EDD configuration parameters: %x:%x\n", Ptr[14], Ptr[13]); if (Ptr[13] != 0xffff && Ptr[14] != 0xffff) { - PUCHAR SpecPtr = (PUCHAR)(ULONG_PTR)((Ptr[13] << 4) + Ptr[14]); + PUCHAR SpecPtr = (PUCHAR)(ULONG_PTR)((Ptr[14] << 4) + Ptr[13]); TRACE("SpecPtr: %x\n", SpecPtr); TRACE("physical I/O port base address: %x\n", *(PUSHORT)&SpecPtr[0]); TRACE("disk-drive control port address: %x\n", *(PUSHORT)&SpecPtr[2]);

1 0

[reactos] 03/05: [FREELDR] iso.c: Perform extra validation before mounting the ISO filesystem (#7367)
by Hermès Bélusca-Maïto 25 Sep '24

25 Sep '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2d0c7de30bdc6ddd7fe7… commit e2d0c7de30bdc6ddd7fe736ff686aabdb2a16c0a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 22 18:04:53 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 25 13:05:02 2024 +0200 [FREELDR] iso.c: Perform extra validation before mounting the ISO filesystem (#7367) Validate the primary volume descriptor version and its reported logical block size. --- boot/freeldr/freeldr/lib/fs/iso.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/boot/freeldr/freeldr/lib/fs/iso.c b/boot/freeldr/freeldr/lib/fs/iso.c index 54222b2a160..1079d578883 100644 --- a/boot/freeldr/freeldr/lib/fs/iso.c +++ b/boot/freeldr/freeldr/lib/fs/iso.c @@ -168,7 +168,7 @@ static ARC_STATUS IsoLookupFile(PCSTR FileName, ULONG DeviceId, PISO_FILE_INFO I RtlZeroMemory(&IsoFileInfo, sizeof(ISO_FILE_INFO)); // - // Read The Primary Volume Descriptor + // Read the Primary Volume Descriptor // Position.HighPart = 0; Position.LowPart = 16 * SECTORSIZE; @@ -502,9 +502,9 @@ const DEVVTBL* IsoMount(ULONG DeviceId) TRACE("Enter IsoMount(%lu)\n", DeviceId); - // - // Read The Primary Volume Descriptor - // + /* + * Read the Primary Volume Descriptor + */ Position.HighPart = 0; Position.LowPart = 16 * SECTORSIZE; Status = ArcSeek(DeviceId, &Position, SeekAbsolute); @@ -514,16 +514,24 @@ const DEVVTBL* IsoMount(ULONG DeviceId) if (Status != ESUCCESS || Count < sizeof(PVD)) return NULL; - // - // Check if PVD is valid. If yes, return ISO9660 function table - // - if (Pvd->VdType == 1 && RtlEqualMemory(Pvd->StandardId, "CD001", 5)) + /* Check if the PVD is valid */ + if (!(Pvd->VdType == 1 && RtlEqualMemory(Pvd->StandardId, "CD001", 5) && Pvd->VdVersion == 1)) { - TRACE("IsoMount(%lu) success\n", DeviceId); - return &Iso9660FuncTable; + WARN("Unrecognized CDROM format\n"); + return NULL; } + if (Pvd->LogicalBlockSizeL != SECTORSIZE) + { + ERR("Unsupported LogicalBlockSize %u\n", Pvd->LogicalBlockSizeL); + return NULL; + } + + Count = (ULONG)((ULONGLONG)Pvd->VolumeSpaceSizeL * SECTORSIZE / 1024 / 1024); + TRACE("Recognized ISO9660 drive, size %lu MB (%lu sectors)\n", + Count, Pvd->VolumeSpaceSizeL); - return NULL; + /* Everything OK, return the ISO9660 function table */ + return &Iso9660FuncTable; } #endif

1 0

[reactos] 02/05: [FREELDR] iso.h: Fix definition of the "Primary Volume Descriptor" PVD structure (#7367)
by Hermès Bélusca-Maïto 25 Sep '24

25 Sep '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56eede6e386c594ec7dae… commit 56eede6e386c594ec7daedeba668ff8c722804f9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 22 17:44:58 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 25 12:56:47 2024 +0200 [FREELDR] iso.h: Fix definition of the "Primary Volume Descriptor" PVD structure (#7367) For reference, see the cdfs/cd.h RAW_ISO_VD structure. Each of the old "VolumeSetSize", "VolumeSequenceNumber" and "LogicalBlockSize" ULONG fields actually correspond to pairs of USHORT fields: "VolumeSetSizeL" and "VolumeSetSizeM", etc., where the "L" one contains the value in little-endian format, while the "M" one contains the same value in big-endian format. Additionally, use UCHARs for the character arrays. --- boot/freeldr/freeldr/include/fs/iso.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/boot/freeldr/freeldr/include/fs/iso.h b/boot/freeldr/freeldr/include/fs/iso.h index 765f49b1fe5..493e90c1ca0 100644 --- a/boot/freeldr/freeldr/include/fs/iso.h +++ b/boot/freeldr/freeldr/include/fs/iso.h @@ -60,18 +60,21 @@ typedef struct _VD_HEADER typedef struct _PVD { UCHAR VdType; // 1 - CHAR StandardId[5]; // 2-6 + UCHAR StandardId[5]; // 2-6 UCHAR VdVersion; // 7 UCHAR unused0; // 8 - CHAR SystemId[32]; // 9-40 - CHAR VolumeId[32]; // 41-72 + UCHAR SystemId[32]; // 9-40 + UCHAR VolumeId[32]; // 41-72 UCHAR unused1[8]; // 73-80 ULONG VolumeSpaceSizeL; // 81-84 ULONG VolumeSpaceSizeM; // 85-88 UCHAR unused2[32]; // 89-120 - ULONG VolumeSetSize; // 121-124 - ULONG VolumeSequenceNumber; // 125-128 - ULONG LogicalBlockSize; // 129-132 + USHORT VolumeSetSizeL; // 121-122 + USHORT VolumeSetSizeM; // 123-124 + USHORT VolumeSeqNumberL; // 125-126 + USHORT VolumeSeqNumberM; // 127-128 + USHORT LogicalBlockSizeL; // 129-130 + USHORT LogicalBlockSizeM; // 131-132 ULONG PathTableSizeL; // 133-136 ULONG PathTableSizeM; // 137-140 ULONG LPathTablePos; // 141-144 @@ -79,8 +82,8 @@ typedef struct _PVD ULONG MPathTablePos; // 149-152 ULONG MOptPathTablePos; // 153-156 DIR_RECORD RootDirRecord; // 157-190 - CHAR VolumeSetIdentifier[128]; // 191-318 - CHAR PublisherIdentifier[128]; // 319-446 + UCHAR VolumeSetIdentifier[128]; // 191-318 + UCHAR PublisherIdentifier[128]; // 319-446 /* more data ... */ } PVD, *PPVD;

1 0

[reactos] 01/05: [FREELDR] Minimally reformat include/fs/iso.h
by Hermès Bélusca-Maïto 25 Sep '24

25 Sep '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d99a70597628cfbca3bb… commit 5d99a70597628cfbca3bb051720c4dbef6acc9db Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 22 17:43:42 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 25 12:56:46 2024 +0200 [FREELDR] Minimally reformat include/fs/iso.h --- boot/freeldr/freeldr/include/fs/iso.h | 128 +++++++++++++++++----------------- 1 file changed, 63 insertions(+), 65 deletions(-) diff --git a/boot/freeldr/freeldr/include/fs/iso.h b/boot/freeldr/freeldr/include/fs/iso.h index 8786e8d5dd2..765f49b1fe5 100644 --- a/boot/freeldr/freeldr/include/fs/iso.h +++ b/boot/freeldr/freeldr/include/fs/iso.h @@ -20,82 +20,80 @@ #pragma once #include <pshpack1.h> -struct _DIR_RECORD +typedef struct _DIR_RECORD { - UCHAR RecordLength; // 1 - UCHAR ExtAttrRecordLength; // 2 - ULONG ExtentLocationL; // 3-6 - ULONG ExtentLocationM; // 7-10 - ULONG DataLengthL; // 11-14 - ULONG DataLengthM; // 15-18 - UCHAR Year; // 19 - UCHAR Month; // 20 - UCHAR Day; // 21 - UCHAR Hour; // 22 - UCHAR Minute; // 23 - UCHAR Second; // 24 - UCHAR TimeZone; // 25 - UCHAR FileFlags; // 26 - UCHAR FileUnitSize; // 27 - UCHAR InterleaveGapSize; // 28 - ULONG VolumeSequenceNumber; // 29-32 - UCHAR FileIdLength; // 33 - UCHAR FileId[1]; // 34 -}; -typedef struct _DIR_RECORD DIR_RECORD, *PDIR_RECORD; + UCHAR RecordLength; // 1 + UCHAR ExtAttrRecordLength; // 2 + ULONG ExtentLocationL; // 3-6 + ULONG ExtentLocationM; // 7-10 + ULONG DataLengthL; // 11-14 + ULONG DataLengthM; // 15-18 + UCHAR Year; // 19 + UCHAR Month; // 20 + UCHAR Day; // 21 + UCHAR Hour; // 22 + UCHAR Minute; // 23 + UCHAR Second; // 24 + UCHAR TimeZone; // 25 + UCHAR FileFlags; // 26 + UCHAR FileUnitSize; // 27 + UCHAR InterleaveGapSize; // 28 + ULONG VolumeSequenceNumber; // 29-32 + UCHAR FileIdLength; // 33 + UCHAR FileId[1]; // 34 +} DIR_RECORD, *PDIR_RECORD; -/* Volume Descriptor header*/ -struct _VD_HEADER +/* Volume Descriptor header */ +typedef struct _VD_HEADER { - UCHAR VdType; // 1 - UCHAR StandardId[5]; // 2-6 - UCHAR VdVersion; // 7 -}; -typedef struct _VD_HEADER VD_HEADER, *PVD_HEADER; + UCHAR VdType; // 1 + UCHAR StandardId[5]; // 2-6 + UCHAR VdVersion; // 7 +} VD_HEADER, *PVD_HEADER; -/* Primary Volume Descriptor */ -struct _PVD +/* + * Primary Volume Descriptor + * See also cdfs/cd.h RAW_ISO_VD + */ +typedef struct _PVD { - UCHAR VdType; // 1 - CHAR StandardId[5]; // 2-6 - UCHAR VdVersion; // 7 - UCHAR unused0; // 8 - CHAR SystemId[32]; // 9-40 - CHAR VolumeId[32]; // 41-72 - UCHAR unused1[8]; // 73-80 - ULONG VolumeSpaceSizeL; // 81-84 - ULONG VolumeSpaceSizeM; // 85-88 - UCHAR unused2[32]; // 89-120 - ULONG VolumeSetSize; // 121-124 - ULONG VolumeSequenceNumber; // 125-128 - ULONG LogicalBlockSize; // 129-132 - ULONG PathTableSizeL; // 133-136 - ULONG PathTableSizeM; // 137-140 - ULONG LPathTablePos; // 141-144 - ULONG LOptPathTablePos; // 145-148 - ULONG MPathTablePos; // 149-152 - ULONG MOptPathTablePos; // 153-156 - DIR_RECORD RootDirRecord; // 157-190 - CHAR VolumeSetIdentifier[128]; // 191-318 - CHAR PublisherIdentifier[128]; // 319-446 + UCHAR VdType; // 1 + CHAR StandardId[5]; // 2-6 + UCHAR VdVersion; // 7 + UCHAR unused0; // 8 + CHAR SystemId[32]; // 9-40 + CHAR VolumeId[32]; // 41-72 + UCHAR unused1[8]; // 73-80 + ULONG VolumeSpaceSizeL; // 81-84 + ULONG VolumeSpaceSizeM; // 85-88 + UCHAR unused2[32]; // 89-120 + ULONG VolumeSetSize; // 121-124 + ULONG VolumeSequenceNumber; // 125-128 + ULONG LogicalBlockSize; // 129-132 + ULONG PathTableSizeL; // 133-136 + ULONG PathTableSizeM; // 137-140 + ULONG LPathTablePos; // 141-144 + ULONG LOptPathTablePos; // 145-148 + ULONG MPathTablePos; // 149-152 + ULONG MOptPathTablePos; // 153-156 + DIR_RECORD RootDirRecord; // 157-190 + CHAR VolumeSetIdentifier[128]; // 191-318 + CHAR PublisherIdentifier[128]; // 319-446 - /* more data ... */ - -}; + /* more data ... */ +} PVD, *PPVD; #include <poppack.h> -typedef struct _PVD PVD, *PPVD; - -typedef struct +typedef struct _ISO_FILE_INFO { - ULONG FileStart; // File start sector - ULONG FileSize; // File size - ULONG FilePointer; // File pointer - BOOLEAN Directory; - ULONG DriveNumber; -} ISO_FILE_INFO, * PISO_FILE_INFO; + ULONG FileStart; // File start sector + ULONG FileSize; // File size + ULONG FilePointer; // File pointer + BOOLEAN Directory; + ULONG DriveNumber; +} ISO_FILE_INFO, *PISO_FILE_INFO; const DEVVTBL* IsoMount(ULONG DeviceId);

1 0

[reactos] 01/01: [WIN32K] Fix protection of USER heap
by Timo Kreuzer 24 Sep '24

24 Sep '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db419efbf26c78e39fb57… commit db419efbf26c78e39fb57bcaf4f9e4d915d0c96e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 26 10:31:18 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Sep 24 13:32:28 2024 +0300 [WIN32K] Fix protection of USER heap Create the section with PAGE_READWRITE, not PAGE_EXECUTE_READWRITE and map in user mode with PAGE_READONLY, not PAGE_EXECUTE_READ. Original commit was ea5261f in 2006. The comments suggest that back then the heap code had issues with it, which is not the case anymore. --- win32ss/user/ntuser/desktop.c | 2 +- win32ss/user/ntuser/usrheap.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index ab8e87daa88..645717a7b1f 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -3262,7 +3262,7 @@ IntMapDesktopView(IN PDESKTOP pdesk) &ViewSize, ViewUnmap, SEC_NO_CHANGE, - PAGE_EXECUTE_READ); /* Would prefer PAGE_READONLY, but thanks to RTL heaps... */ + PAGE_READONLY); if (!NT_SUCCESS(Status)) { ERR("Failed to map desktop\n"); diff --git a/win32ss/user/ntuser/usrheap.c b/win32ss/user/ntuser/usrheap.c index f668331b374..b3515c5a76b 100644 --- a/win32ss/user/ntuser/usrheap.c +++ b/win32ss/user/ntuser/usrheap.c @@ -81,7 +81,7 @@ IntUserHeapCommitRoutine( &ViewSize, ViewUnmap, SEC_NO_CHANGE, - PAGE_EXECUTE_READ); /* Would prefer PAGE_READONLY, but thanks to RTL heaps... */ + PAGE_READONLY); if (!NT_SUCCESS(Status)) return Status; @@ -97,7 +97,7 @@ IntUserHeapCommitRoutine( 0, CommitSize, MEM_COMMIT, - PAGE_EXECUTE_READ); + PAGE_READONLY); if (NT_SUCCESS(Status)) { @@ -139,7 +139,7 @@ IntUserHeapCreate(IN PVOID SectionObject, &ViewSize, ViewUnmap, SEC_NO_CHANGE, - PAGE_EXECUTE_READ); /* Would prefer PAGE_READONLY, but thanks to RTL heaps... */ + PAGE_READONLY); if (!NT_SUCCESS(Status)) return NULL; @@ -148,7 +148,7 @@ IntUserHeapCreate(IN PVOID SectionObject, 0, &ViewSize, MEM_COMMIT, - PAGE_EXECUTE_READ); /* Would prefer PAGE_READONLY, but thanks to RTL heaps... */ + PAGE_READONLY); MmUnmapViewOfSection(PsGetCurrentProcess(), MappedView); @@ -193,7 +193,7 @@ UserCreateHeap(OUT PVOID *SectionObject, SECTION_ALL_ACCESS, NULL, &SizeHeap, - PAGE_EXECUTE_READWRITE, /* Would prefer PAGE_READWRITE, but thanks to RTL heaps... */ + PAGE_READWRITE, SEC_RESERVE | 1, NULL, NULL); @@ -315,7 +315,7 @@ MapGlobalUserHeap(IN PEPROCESS Process, &ViewSize, ViewUnmap, SEC_NO_CHANGE, - PAGE_EXECUTE_READ); /* Would prefer PAGE_READONLY, but thanks to RTL heaps... */ + PAGE_READONLY); if (!NT_SUCCESS(Status)) { ERR_CH(UserProcess, "MapGlobalUserHeap - Failed to map the global heap! 0x%x\n", Status);

1 0

[reactos] 01/01: [NETID] Fix header in Romanian (ro-RO) translation (#7357)
by Andrei Miloiu 21 Sep '24

21 Sep '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9139d0fab14803e750d76… commit 9139d0fab14803e750d76216b1b0ccda197d5b7b Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Sep 21 19:40:52 2024 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 21 19:40:52 2024 +0300 [NETID] Fix header in Romanian (ro-RO) translation (#7357) --- dll/win32/netid/lang/ro-RO.rc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dll/win32/netid/lang/ro-RO.rc b/dll/win32/netid/lang/ro-RO.rc index ef3f5a1e489..c4666836baf 100644 --- a/dll/win32/netid/lang/ro-RO.rc +++ b/dll/win32/netid/lang/ro-RO.rc @@ -1,8 +1,9 @@ /* - * FILE: dll/win32/netid/lang/ro-RO.rc - * ReactOS Project (https://reactos.org) - * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> - * Copyright 2023-2024 Andrei Miloiu <miloiuandrei(a)gmail.com> + * PROJECT: ReactOS Network ID Page + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023-2024 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

1 0

[reactos] 01/01: [USETUP] Fix handling of 0 sized files in the cab
by Timo Kreuzer 20 Sep '24

20 Sep '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=469d4dbbab3ae55b87e71… commit 469d4dbbab3ae55b87e71b583f234fdee0598db9 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Sep 2 14:47:17 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Sep 20 14:08:13 2024 +0300 [USETUP] Fix handling of 0 sized files in the cab --- base/setup/usetup/spapisup/cabinet.c | 76 ++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 34 deletions(-) diff --git a/base/setup/usetup/spapisup/cabinet.c b/base/setup/usetup/spapisup/cabinet.c index 414008163a5..52c35ed1888 100644 --- a/base/setup/usetup/spapisup/cabinet.c +++ b/base/setup/usetup/spapisup/cabinet.c @@ -1104,6 +1104,48 @@ CabinetExtractFile( } } + if (!ConvertDosDateTimeToFileTime(Search->File->FileDate, + Search->File->FileTime, + &FileTime)) + { + DPRINT1("DosDateTimeToFileTime() failed\n"); + Status = CAB_STATUS_CANNOT_WRITE; + goto CloseDestFile; + } + + NtStatus = NtQueryInformationFile(DestFile, + &IoStatusBlock, + &FileBasic, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if (!NT_SUCCESS(NtStatus)) + { + DPRINT("NtQueryInformationFile() failed (%x)\n", NtStatus); + } + else + { + memcpy(&FileBasic.LastAccessTime, &FileTime, sizeof(FILETIME)); + + NtStatus = NtSetInformationFile(DestFile, + &IoStatusBlock, + &FileBasic, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if (!NT_SUCCESS(NtStatus)) + { + DPRINT("NtSetInformationFile() failed (%x)\n", NtStatus); + } + } + + SetAttributesOnFile(Search->File, DestFile); + + /* Nothing more to do for 0 sized files */ + if (Search->File->FileSize == 0) + { + Status = CAB_STATUS_SUCCESS; + goto CloseDestFile; + } + MaxDestFileSize.QuadPart = Search->File->FileSize; NtStatus = NtCreateSection(&DestFileSection, SECTION_ALL_ACCESS, @@ -1139,40 +1181,6 @@ CabinetExtractFile( } CurrentDestBuffer = DestFileBuffer; - if (!ConvertDosDateTimeToFileTime(Search->File->FileDate, - Search->File->FileTime, - &FileTime)) - { - DPRINT1("DosDateTimeToFileTime() failed\n"); - Status = CAB_STATUS_CANNOT_WRITE; - goto UnmapDestFile; - } - - NtStatus = NtQueryInformationFile(DestFile, - &IoStatusBlock, - &FileBasic, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (!NT_SUCCESS(NtStatus)) - { - DPRINT("NtQueryInformationFile() failed (%x)\n", NtStatus); - } - else - { - memcpy(&FileBasic.LastAccessTime, &FileTime, sizeof(FILETIME)); - - NtStatus = NtSetInformationFile(DestFile, - &IoStatusBlock, - &FileBasic, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (!NT_SUCCESS(NtStatus)) - { - DPRINT("NtSetInformationFile() failed (%x)\n", NtStatus); - } - } - - SetAttributesOnFile(Search->File, DestFile); } /* Call extract event handler */

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