Ros-diffs

ros-diffs@reactos.org

17 participants
81085 discussions

[reactos] 01/01: [BOOTSECT][FREELDR] Support booting from NTFS partitions (#3416)

by Sylvain Deverre

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0d73e0f7fa97b17e636c… commit f0d73e0f7fa97b17e636c76653172ff2122f434f Author: Sylvain Deverre <deverre.sylv(a)gmail.com> AuthorDate: Thu Aug 17 15:07:59 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 17 15:07:59 2023 +0200 [BOOTSECT][FREELDR] Support booting from NTFS partitions (#3416) Implement NTFS boot sector that loads FreeLdr from a NTFS partition. CORE-17474 - Able to find/parse root directory; - Handle fixups in FILE MFT record; - Implement directory tree search; - Implement loading found file from disk; - Handle fixups in INDX records; - Fail if compressed or sparse; - Attempt to support 64-bit disks. Some TO-DOs for later: - Handle "weird" NTFS partition with uncommon sector sizes / sectors per cluster / sectors per index record; - Better implementation for file loading; - 64-bit LCN support. --- boot/freeldr/bootsect/CMakeLists.txt | 2 + boot/freeldr/bootsect/ntfs.S | 893 +++++++++++++++++++++++++++++++++++ boot/freeldr/freeldr/lib/fs/ntfs.c | 2 +- 3 files changed, 896 insertions(+), 1 deletion(-) diff --git a/boot/freeldr/bootsect/CMakeLists.txt b/boot/freeldr/bootsect/CMakeLists.txt index d0c527779d5..a46c9066c6a 100644 --- a/boot/freeldr/bootsect/CMakeLists.txt +++ b/boot/freeldr/bootsect/CMakeLists.txt @@ -8,6 +8,7 @@ if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 7c00) CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) + CreateBootSectorTarget(ntfsvbr ${CMAKE_CURRENT_SOURCE_DIR}/ntfs.S ${CMAKE_CURRENT_BINARY_DIR}/ntfs.bin 7c00) CreateBootSectorTarget(btrfsvbr ${CMAKE_CURRENT_SOURCE_DIR}/btrfs.S ${CMAKE_CURRENT_BINARY_DIR}/btrfs.bin 7c00) if(SARCH STREQUAL "pc98") @@ -34,6 +35,7 @@ if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") add_cd_file(TARGET btrfsvbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/btrfs.bin FOR bootcd regtest) add_cd_file(TARGET fat DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat.bin FOR bootcd regtest) add_cd_file(TARGET fat32 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin FOR bootcd regtest) + add_cd_file(TARGET ntfsvbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/ntfs.bin FOR bootcd regtest) add_cd_file(TARGET isoboot DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FILE ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin FOR all hybridcd) add_cd_file(TARGET isobtrt DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FILE ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin FOR bootcd regtest) elseif(ARCH STREQUAL "arm") diff --git a/boot/freeldr/bootsect/ntfs.S b/boot/freeldr/bootsect/ntfs.S new file mode 100644 index 00000000000..85081df464a --- /dev/null +++ b/boot/freeldr/bootsect/ntfs.S @@ -0,0 +1,893 @@ +/* + * PROJECT: ReactOS Bootsector + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * FILE: boot/freeldr/bootsect/fat32.S + * PURPOSE: Implementing boot sector for NTFS + * COPYRIGHT: Copyright 2020 Sylvain Deverre (deverre.sylv(a)gmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.inc> +#include <freeldr/include/arch/pc/x86common.h> + +.code16 + +//ORG HEX(7c00) + +start: + jmp short main + nop +OEMName: + .ASCII "NTFS " // NTFS signature +BytesPerSector: + .word 512 +SectsPerCluster: + .byte 8 +ReservedSectors: + .word 0 // Unused by NTFS +NumberOfFats: + .byte 0 // Unused by NTFS +MaxRootEntries: + .word 0 // Unused by NTFS +TotalSectors: + .word 0 // Unused by NTFS +MediaDescriptor: + .byte HEX(0f8) +SectorsPerFat: + .word 0 // Unused by NTFS +SectorsPerTrack: + .word 0 // Should contain disk geometry +NumberOfHeads: + .word 0 // Should contain disk geometry +HiddenSectors: + .long 0 // Filled by format program +TotalSectorsBig: + .long 0 // Unused by NTFS +// NTFS inserted info +BootDrive: + .byte HEX(80) +CurrentHead: + .byte 0 +BootSignature: + .byte HEX(80) +Unused: + .byte 0 +VolumeSectorCount: + .quad 0 // Must be patched by format program ! +MftLocation: + .quad 0 // Must be patched by format program ! +MftMirrorLocation: + .quad 0 // Must be patched by format program ! +ClustersPerMftRecord: + .long 0 +ClustersPerIndexRecord: + .long 0 +VolumeSerialNumber: + .quad 0 +Checksum: + .long 0 + +main: + xor ax,ax // Setup segment registers + mov ds,ax // Make DS correct + mov es,ax // Make ES correct + mov ss,ax // Make SS correct + mov sp, HEX(7c00) + mov bp, sp // Setup a stack + + cmp byte ptr [BootDrive], HEX(0ff) // If they have specified a boot drive then use it + jne GetDriveParameters + + mov byte ptr [BootDrive], dl // Save the boot drive + +GetDriveParameters: + mov ah, 8 + mov dl, byte ptr [BootDrive] // Get boot drive in dl + int HEX(13) // Request drive parameters from the bios + jnc CalcDriveSize // If the call succeeded then calculate the drive size + + // If we get here then the call to the BIOS failed + // so just set CHS equal to the maximum addressable + // size + mov cx, HEX(0ffff) + mov dh, cl + +CalcDriveSize: + // Now that we have the drive geometry + // lets calculate the drive size + mov bl, ch // Put the low 8-bits of the cylinder count into BL + mov bh, cl // Put the high 2-bits in BH + shr bh, 6 // Shift them into position, now BX contains the cylinder count + and cl, HEX(3f) // Mask off cylinder bits from sector count + // CL now contains sectors per track and DH contains head count + movzx eax, dh // Move the heads into EAX + movzx ebx, bx // Move the cylinders into EBX + movzx ecx, cl // Move the sectors per track into ECX + inc eax // Make it one based because the bios returns it zero based + inc ebx // Make the cylinder count one based also + mul ecx // Multiply heads with the sectors per track, result in edx:eax + mul ebx // Multiply the cylinders with (heads * sectors) [stored in edx:eax already] + + // We now have the total number of sectors as reported + // by the bios in eax, so store it in our variable + mov dword ptr ds:[BiosCHSDriveSize], eax + +LoadExtraBootCode: + // First we have to load our extra boot code at + // next sector into memory at [0000:7e00h] + mov eax, HEX(1) + xor edx, edx + mov cx, 4 + xor bx, bx + mov es, bx // Read sector to [0000:7e00h] + mov bx, HEX(7e00) + call ReadSectors + jmp StartSearch + + +// Reads logical sectors into [ES:BX] +// EDX:EAX has logical sector number to read +// CX has number of sectors to read +ReadSectors: + push es + add eax, dword ptr [HiddenSectors] // Add offset from the disk beginning + test edx, edx + jnz ReadSectorsLBA + cmp eax, dword ptr ds:[BiosCHSDriveSize] // Check if they are reading a sector outside CHS range + jae ReadSectorsLBA // Yes - go to the LBA routine + // If at all possible we want to use LBA routines because + // They are optimized to read more than 1 sector per read + + pushad // Save logical sector number & sector count + +CheckInt13hExtensions: // Now check if this computer supports extended reads + mov ah, HEX(41) // AH = 41h + mov bx, HEX(55aa) // BX = 55AAh + mov dl, byte ptr [BootDrive] // DL = drive (80h-FFh) + int HEX(13) // IBM/MS INT 13 Extensions - INSTALLATION CHECK + jc ReadSectorsCHS // CF set on error (extensions not supported) + cmp bx, HEX(0aa55) // BX = AA55h if installed + jne ReadSectorsCHS + test cl,1 // CX = API subset support bitmap + jz ReadSectorsCHS // Bit 0, extended disk access functions (AH=42h-44h,47h,48h) supported + + popad // Restore sector count & logical sector number + +ReadSectorsLBA: + pushad // Save logical sector number & sector count + + cmp cx, 64 // Since the LBA calls only support 0x7F sectors at a time we will limit ourselves to 64 + jbe ReadSectorsSetupDiskAddressPacket // If we are reading less than 65 sectors then just do the read + mov cx, 64 // Otherwise read only 64 sectors on this loop iteration + +ReadSectorsSetupDiskAddressPacket: + mov word ptr ds:[LBASectorsRead],cx + push edx + push eax // Put 64-bit logical block address on stack + push es // Put transfer segment on stack + push bx // Put transfer offset on stack + push cx // Set transfer count + push 16 // Set size of packet to 10h + mov si, sp // Setup disk address packet on stack + + mov dl, byte ptr [BootDrive] // Drive number + mov ah, HEX(42) // Int 13h, AH = 42h - Extended Read + int HEX(13) // Call BIOS + jc PrintDiskError // If the read failed then abort + + add sp, 16 // Remove disk address packet from stack + + popad // Restore sector count & logical sector number + + push bx + mov ebx, dword ptr ds:[LBASectorsRead] + add eax, ebx // Increment sector to read + adc edx, 0 + shl ebx, 5 + mov dx, es + add dx, bx // Setup read buffer for next sector + mov es, dx + pop bx + + sub cx, word ptr ds:[LBASectorsRead] + jnz ReadSectorsLBA // Read next sector + + pop es + ret + +LBASectorsRead: + .long 0 + + +// Reads logical sectors into [ES:BX] +// EAX has logical sector number to read +// CX has number of sectors to read +ReadSectorsCHS: + popad // Get logical sector number & sector count off stack + +ReadSectorsCHSLoop: + pushad + xor edx, edx + movzx ecx, word ptr [SectorsPerTrack] + div ecx // Divide logical by SectorsPerTrack + inc dl // Sectors numbering starts at 1 not 0 + mov cl, dl // Sector in CL + mov edx, eax + shr edx, 16 + div word ptr [NumberOfHeads] // Divide logical by number of heads + mov dh, dl // Head in DH + mov dl, byte ptr [BootDrive] // Drive number in DL + mov ch, al // Cylinder in CX + ror ah, 2 // Low 8 bits of cylinder in CH, high 2 bits + // in CL shifted to bits 6 & 7 + or cl, ah // Or with sector number + mov ax, HEX(0201) + int HEX(13) // DISK - READ SECTORS INTO MEMORY + // AL = number of sectors to read, CH = track, CL = sector + // DH = head, DL = drive, ES:BX -> buffer to fill + // Return: CF set on error, AH = status (see AH=01h), AL = number of sectors read + + jc PrintDiskError // If the read failed then abort + + popad + + inc eax // Increment Sector to Read + + mov dx, es + add dx, 32 // Increment read buffer for next sector + mov es, dx + + loop ReadSectorsCHSLoop // Read next sector + + pop es + ret + +// Displays a disk error message +// And reboots +PrintDiskError: + mov si, offset msgDiskError // Bad boot disk message + call PutChars // Display it + + jmp Reboot + +// Displays a file system error message +// And reboots +PrintFileSystemError: + mov si, offset msgFileSystemError // FreeLdr not found message + call PutChars // Display it + +Reboot: + mov si, offset msgAnyKey // Press any key message + call PutChars // Display it + xor ax, ax + int HEX(16) // Wait for a keypress + int HEX(19) // Reboot + +PutChars: + lodsb + or al, al + jz short Done + mov ah, HEX(0e) + mov bx, 7 + int HEX(10) + jmp short PutChars +Done: + ret + +msgDiskError: + .ascii "Disk error", CR, LF, NUL +msgFileSystemError: + .ascii "File system error", CR, LF, NUL +msgAnyKey: + .ascii "Press any key to restart", CR, LF, NUL + +SectsPerMFT: + .word 0 + +MFTStartSector: + .quad 0 + +BiosCHSDriveSize: + .long 0 + +.org 509 // Pad to 509 bytes +BootPartition: + .byte 1 + +BootFlagSignature: + .word HEX(0aa55) // BootSector signature + +// End of Bootsector +// Next sector starts as sector 2, since boot sector is +// as a file under NTFS ($Boot, which has inode number 7) +// and takes the two first clusters of the volume (which means +// 16 sectors, checked on Windows and mkfs.ntfs from ntfsutils) + +#define ATTRIBUTE_DATA HEX(80) +#define ATTRIBUTE_INDEX_ROOT HEX(90) +#define ATTRIBUTE_INDEX_ALLOCATION HEX(A0) +#define FILE_MAGIC HEX(454c4946) +#define INDX_MAGIC HEX(58444e49) +#define NTFS_FILE_ROOT 5 +StartSearch: + // Compute MFT start sector + mov eax, dword ptr [MftLocation] + mov cl, byte ptr [SectsPerCluster] + movzx ecx, cx + mul ecx + mov dword ptr [MFTStartSector], eax + + // Compute size of MFT entry in sectors + xor ax, ax + mov al, byte ptr [ClustersPerMftRecord] + test al, al + js NegativeOffset + mov cx, word ptr [SectsPerCluster] + mul cx + mov word ptr [SectsPerMFT], cx + jmp SearchNext + NegativeOffset: + // ClustersPerMftRecord is negative, so we need to perform 1 << (-ClustersPerMftRecord) + // to get the number of bytes needed for a MFT entry + not al + inc al + mov cl, al + xor ax, ax + inc ax + shl ax, cl + + // But here want to store sectors, so we need to divide by BytesPerSector + xor dx, dx + mov cx, word ptr [BytesPerSector] + div cx + mov word ptr [SectsPerMFT], ax + + SearchNext: + mov bp, sp + sub sp, HEX(10) + + // Read Root Directory MFT into [2000:0] + mov ax, HEX(2000) + mov es, ax + xor bx, bx + xor edx, edx + mov eax, NTFS_FILE_ROOT + call ReadInode + + // Finds freeldr.sys into index root's B-Tree + // and return its MFT index + xor ax, ax + call ExploreIndexRoot + + // Read the MFT entry of freeldr.sys into [A00:0] + push eax + mov ax, HEX(A00) + mov es, ax + pop eax + call ReadInode + + xor ax, ax + mov ebx, HEX(30) + call FindAttributeHdr + mov si, ax + // Move to the attribute data + add si, word ptr es:[si + HEX(14)] + + // We don't support compressed, sparse or encrypted Freeldr + test dword ptr es:[si + HEX(38)], HEX(4a00) + jnz CompressedFreeldr + + // Compute size in clusters + mov eax, dword ptr es:[si + HEX(28)] + mov cl, byte ptr [SectsPerCluster] + xor edx, edx + div ecx + mov cx, word ptr [BytesPerSector] + movzx ecx, cx + xor edx, edx + div ecx + mov edx, eax + + push ax + mov si, offset msgLoading + call PutChars + pop ax + + xor ax, ax + mov ebx, HEX(80) + call FindAttributeHdr + mov si, ax + add ax, word ptr es:[si + HEX(20)] + xor ecx, ecx + xor bx, bx + push FREELDR_BASE / 16 + pop fs + FreeLdrLoad: + pushad + call ReadNonResidentAttribute + popad + mov bx, fs + add bx, HEX(100) + mov fs, bx + xor bx, bx + inc ecx + cmp ecx, edx + jbe FreeLdrLoad + + mov dl, byte ptr [BootDrive] + mov dh, byte ptr [BootPartition] + ljmp16 0, FREELDR_BASE + +// Error message if Freeldr is compressed, encrypted or sparse +CompressedFreeldr: + mov si, offset msgFreeldrCompressed + call PutChars + jmp Reboot + +// Finds Freeldr.sys into the directory tree and returns the +// inode index +// INPUT: +// - ES:[AX] address of the MFT record +// OUTPUT: +// - EDX:EAX MFT number of the found file +ExploreIndexRoot: + #define fileRecordBase 2 + #define fileRecord 4 + #define indexRootData 6 + #define allocationRunList 8 + + push bp + mov bp, sp + push bx + push si + push di + sub sp, HEX(10) + mov word ptr [bp - fileRecordBase], es + mov word ptr [bp - fileRecord], ax + + mov ebx, ATTRIBUTE_INDEX_ROOT + call FindAttributeHdr + test ax, ax + jz PrintFileSystemError // fail if no INDEX_ROOT + + mov si, ax + cmp byte ptr es:[si + 8], HEX(0) + jnz PrintFileSystemError // fail if attribute is non-resident + + add si, word ptr es:[si + HEX(14)] + cmp dword ptr es:[si], HEX(30) + jnz PrintFileSystemError // fail if FILE_NAME attribute isn't indexed + + mov word ptr [bp - indexRootData], si + mov ax, word ptr [bp - fileRecord] + + test byte ptr es:[si + HEX(0c)], 1 + jz ExploreNext // Skip index allocation lookup if we don't have children + + mov ebx, ATTRIBUTE_INDEX_ALLOCATION + call FindAttributeHdr + test ax, ax + jz PrintFileSystemError // No INDEX_ALLOCATION found + + mov si, ax + cmp byte ptr es:[si + 8], 1 + jnz PrintFileSystemError // Fail if attribute is resident (shouldn't be) + + add si, word ptr es:[si + HEX(20)] + mov word ptr [bp - allocationRunList], si // save run list + + ExploreNext: + mov si, word ptr [bp - indexRootData] + lea si, [si + 32] // get the first INDEX_ENTRY + + // Main search loop. We browse the B-Tree which contains directory entries + // SI contains the current index entry. + NodeCheck: + test word ptr es:[si + HEX(0C)], 2 + jnz NodeCheckLastNode + + mov cl, byte ptr es:[si + HEX(50)] + movzx cx, cl + lea si, [si + HEX(52)] + mov di, offset FreeLdr + call CompareWideStrInsensitive + lea si, [si - HEX(52)] + test ax, ax + jz RootIndexFound + test word ptr es:[si + HEX(0C)], 1 + jz ContinueSearch + + test ax, HEX(f000) + jnz LookupChildNode // if result < 0 then explore child node + + ContinueSearch: + add si, word ptr es:[si + 8] + jmp NodeCheck + + RootIndexFound: + mov eax, dword ptr es:[si] // We found root entry, return with its MFT number + mov dx, word ptr es:[si + 4] // Return high part into edx. + // We take only the first word, the high word contains the + // sequence number + movzx edx, dx + jmp ExitIndexTree + + NodeCheckLastNode: + test word ptr es:[si + HEX(0C)], 1 + jz PrintFreeldrError + + LookupChildNode: + // Take the right LCN at the end of the index record + add si, word ptr es:[si + 8] + mov ecx, dword ptr es:[si - 8] + + // Read the fixed up LCN + mov bx, word ptr [bp - allocationRunList] + mov ax, word ptr [bp - fileRecordBase] + mov es, ax + mov ax, HEX(9000) + mov fs, ax + mov ax, bx + xor bx, bx + call ReadINDX + + // Go again to the loop but with the child node list + mov ax, HEX(9000) + mov es, ax + mov si, 0 + add si, es:[si + HEX(18)] // Go to the first node + lea si, [si + HEX(18)] + jmp NodeCheck + + ExitIndexTree: + pop di + pop si + mov sp, bp + pop bp + ret + +// 64-bit multiplication +// EDX:EAX operand +// ECX operator +Multiply64: + push bp + mov bp, sp + sub sp, 12 + // Save the high part of the multiplication + mov dword ptr [bp - 4], edx + + // Multiply the low part and save the result + mul ecx + mov dword ptr[bp - 8], eax + mov dword ptr[bp - 12], edx + + // Multiply the high part and add the carry + mov eax, dword ptr [bp - 4] + mul ecx + add eax, dword ptr [bp - 12] + + // Format correctly the number + mov edx, eax + mov eax, dword ptr [bp - 8] + mov sp, bp + pop bp + ret + +// Compare case-insensitive strings +// [ES:SI] - the source file name +// [DS:DI] - the destination file name +// CX - compare length +CompareWideStrInsensitive: + push bx + push si + push di + movzx cx, cl + CmpLoop: + mov ax, word ptr es:[si] + cmp ax, 'a' + jl NoUpper + cmp ax, 'z' + jg NoUpper + sub ax, HEX(20) + NoUpper: + mov bx, word ptr ds:[di] + sub bx, ax + test bx, bx + jnz CompareFail + add si, 2 + add di, 2 + dec cx + jnz CmpLoop + CompareFail: + mov ax, bx + pop di + pop si + pop bx + ret + +// Reads a NTFS cluster +// INPUT: +// - EDX:EAX : cluster number to read +// OUTPUT: +// - ES:BX : address to read +ReadCluster: + push ecx + mov cl, byte ptr [SectsPerCluster] // Convert clusters to sectors + movzx ecx, cx + call Multiply64 + call ReadSectors + pop ecx + ret + +// Reads a MFT entry +// INPUT: +// - EDX:EAX : MFT inode +// OUTPUT: +// - ES:[BX] : address to read +ReadInode: + push ecx + push si + push di + + push edx + mov cx, word ptr [SectsPerMFT] // Get the correct number of sectors for the FILE entry + movzx ecx, cx + mul ecx + movzx eax, ax + add eax, dword ptr [MFTStartSector] // Add it to the start of the MFT + mov cx, word ptr [SectsPerMFT] + movzx ecx, cx + pop edx + call ReadSectors + + cmp dword ptr es:[bx], FILE_MAGIC // Ensure we get a valid FILE record + jnz PrintFileSystemError + + call ApplyFixups + + pop di + pop si + pop ecx + ret + +#define UpdateSequenceOffset 4 +#define UpdateSequenceLen 6 +// Apply fixups to INDX and FILE records +// INPUT: +// - ES:[BX] - pointer to the record to fixup +ApplyFixups: + push si + push di + mov si, bx + add si, word ptr es:[bx + UpdateSequenceOffset] + xor cx, cx + inc cx + FixupLoop: + cmp cx, word ptr es:[bx + UpdateSequenceLen] + jz EndFixupLoop + mov si, bx + add si, word ptr es:[bx + UpdateSequenceOffset] + mov ax, word ptr es:[si] // Get first fixup value + + mov di, cx + shl di, 9 + add di, bx + sub di, 2 + cmp ax, word ptr es:[di] // Check fixup value + jnz PrintFileSystemError // Fixup is corrupted, so print error + inc cx + add si, cx + mov ax, word ptr es:[si] // Apply fixup + mov word ptr es:[di], ax + + jmp FixupLoop + EndFixupLoop: + + pop di + pop si + ret + +// Reads a non-resident attribute +// INPUT: +// - ES:[AX] : Address of the data runs +// - ECX : LCN to read +// OUTPUT: +// - FS:[BX] : Address to write to +ReadNonResidentAttribute: + #define currentLCN 4 + #define offsetWrite 8 + #define startReadLCN HEX(0C) + push bp + mov bp, sp + sub sp, HEX(10) + push edx + push si + mov dword ptr [bp - currentLCN], 0 // Store the current LCN + mov word ptr [bp - offsetWrite], bx + mov dword ptr [bp - startReadLCN], ecx + mov si, ax + xor edx, edx + RunLoop: + mov al, byte ptr es:[si] + test al, al + jz NotFound + call UnpackRun + add dword ptr [bp - currentLCN], eax + cmp dword ptr [bp - startReadLCN], ecx + jb FoundRun + sub dword ptr [bp - startReadLCN], ecx // Decrement the cluster + jmp RunLoop + FoundRun: + mov ebx, dword ptr [bp - currentLCN] + mov ecx, dword ptr [bp - startReadLCN] + add ebx, ecx + + push es + mov ax, fs + mov es, ax + mov eax, ebx + mov bx, word ptr [bp - offsetWrite] + call ReadCluster + pop es + jmp RunSearchEnd + NotFound: + xor ax, ax + RunSearchEnd: + pop si + pop edx + mov sp, bp + pop bp + ret + +// Decodes a run in the runlist +// INPUT: +// - ES:[SI] : address of the run +// OUTPUT: +// - EAX : Unpacked LCN +// - ECX : Unpacked run length (in sectors) +// - SI : Next run in the run list +UnpackRun: + push bp + mov bp, sp + sub sp, HEX(10) + push ebx + + // Unpack run header + mov bl, byte ptr es:[si] + inc si + + mov bh, bl + shr bh, 4 + and bl, 7 + mov byte ptr [bp-2], bh // BH contains the LCN length + mov byte ptr [bp-1], bl // BL contains the number of cluster length + + mov al, bl + call UnpackLen + mov dword ptr [bp - 8], ebx + + mov al, byte ptr [bp-2] + call UnpackLen + mov cl, byte ptr es:[si-1] // Fixup sign if last byte is > 255 + test cl, HEX(80) + jz NoSign + not eax + add ebx, eax + + NoSign: + mov eax, ebx + mov ecx, dword ptr [bp - 8] + pop ebx + mov sp, bp + pop bp + ret + + +// Auxiliary function that unpacks n bytes in the memory +// INPUT: +// - AL : size to unpack (max 4 bytes) +// OUTPUT: +// - EAX : the mask used to unpack (for negative number fixup) +// - EBX : the unpacked number +// - SI : Next byte to read +UnpackLen: + push cx + movzx ax, al + + // Read the whole DWORD and then compute a mask to remove + // unneeded bytes to get correct size + xor ebx, ebx + mov ebx, dword ptr es:[si] + add si, ax + + cmp al, 4 + jnz UnpackLen_not4 + xor eax, eax + dec eax + jmp UnpackLen_mask + +UnpackLen_not4: + mov cl, al // Compute mask (2^(8*len) - 1) + shl cl, 3 + xor eax, eax + inc eax + shl eax, cl + dec eax + +UnpackLen_mask: + and ebx, eax // Apply mask + pop cx + ret + +// Reads an INDX sector and applies fixups +// INPUT: +// - ES:[AX] : Address of the data runs +// - ECX : LCN to read +// OUTPUT: +// - FS:[BX] : Address to write to +ReadINDX: + push es + push bx + call ReadNonResidentAttribute + test ax, ax + jz PrintFileSystemError + cmp dword ptr fs:[0], INDX_MAGIC + jnz PrintFileSystemError // jump if not valid + pop bx + + mov ax, fs + mov es, ax + call ApplyFixups + pop es + ret + +// Finds an attribute header into the MFT +// INPUT: +// - ES:[AX] : pointer to the MFT entry +// - EBX : type to find +// OUTPUT: +// - ES:[AX] : Pointer to the attribute header in the MFT entry +FindAttributeHdr: + push cx + push si + push edx + mov si, ax + mov cx, word ptr es:[si+HEX(14)] // Get offset attribute + add si, cx + FindAttributeHdrLoop: + mov edx, dword ptr es:[si] // Get attribute type + cmp edx, ebx + jz AttrFound + cmp edx, HEX(ffffffff) + jz AttrNotFound + add cx, word ptr es:[si + 4] // Add size of the attribute + add si, word ptr es:[si + 4] + jmp FindAttributeHdrLoop + + AttrNotFound: + // Attribute not found, reset the offset + xor cx, cx + AttrFound: + mov ax, cx + pop edx + pop si + pop cx + ret + +PrintFreeldrError: + mov si, offset msgFreeldr + call PutChars + jmp Reboot + +FreeLdr: + .word 'F', 'R', 'E', 'E', 'L', 'D', 'R', '.', 'S', 'Y', 'S' +msgFreeldr: + .ascii "FreeLdr not found, cannot boot", CR, LF, NUL +msgLoading: + .ascii "Loading FreeLoader...", CR, LF, NUL +msgFreeldrCompressed: + .ascii "freeldr.sys is a sparse, compressed or encrypted file, cannot boot", CR, LF, NUL +.endcode16 + +END diff --git a/boot/freeldr/freeldr/lib/fs/ntfs.c b/boot/freeldr/freeldr/lib/fs/ntfs.c index c7e41c23ef8..9361f526932 100644 --- a/boot/freeldr/freeldr/lib/fs/ntfs.c +++ b/boot/freeldr/freeldr/lib/fs/ntfs.c @@ -1,7 +1,7 @@ /* * FreeLoader NTFS support * Copyright (C) 2004 Filip Navara <xnavara(a)volny.cz> - * Copyright (C) 2009-2010 Herv� Poussineau + * Copyright (C) 2009-2010 Herv� Poussineau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by

1 year, 5 months

[reactos] 01/01: [CMD][TESTS] Fix typo in "height" word (#5580)

by Mustafa Ateş Uzun

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d2f6b65b3bfe2d8597ca… commit 7d2f6b65b3bfe2d8597ca8d499aeb4f831911654 Author: Mustafa Ateş Uzun <mustafauzun0(a)gmail.com> AuthorDate: Thu Aug 17 14:30:26 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 17 14:30:26 2023 +0300 [CMD][TESTS] Fix typo in "height" word (#5580) --- base/shell/cmd/lang/cs-CZ.rc | 4 ++-- base/shell/cmd/lang/el-GR.rc | 4 ++-- base/shell/cmd/lang/es-ES.rc | 2 +- base/shell/cmd/lang/id-ID.rc | 4 ++-- base/shell/cmd/lang/pl-PL.rc | 4 ++-- base/shell/cmd/lang/sk-SK.rc | 4 ++-- base/shell/cmd/lang/sq-AL.rc | 4 ++-- base/shell/cmd/lang/uk-UA.rc | 4 ++-- modules/rostests/tests/combotst/combotst.c | 4 ++-- modules/rostests/tests/edit/edittest.c | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc index 043cbcfca8a..2005df0a6c5 100644 --- a/base/shell/cmd/lang/cs-CZ.rc +++ b/base/shell/cmd/lang/cs-CZ.rc @@ -453,14 +453,14 @@ Updates are available at: https://reactos.org" STRING_VOL_HELP3 " Volume Serial Number is %04X-%04X\n" STRING_VOL_HELP4 "Displays the disk volume label and serial number, if they exist.\n\nVOL [drive:]" STRING_WINDOW_HELP1 "change console window aspect\n\n\ -WINDOW [/POS[=]left,top,width,heigth]\n\ +WINDOW [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ /POS specify window placement and dimensions\n\ MIN minimize the window\n\ MAX maximize the window\n\ RESTORE restore the window" STRING_WINDOW_HELP2 "change console window aspect\n\n\ -ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ +ACTIVATE 'window' [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ window tile of window on which perform actions\n\ /POS specify window placement and dimensions\n\ diff --git a/base/shell/cmd/lang/el-GR.rc b/base/shell/cmd/lang/el-GR.rc index fc811d25dc6..a5fbf33c3fc 100644 --- a/base/shell/cmd/lang/el-GR.rc +++ b/base/shell/cmd/lang/el-GR.rc @@ -452,14 +452,14 @@ Updates are available at: https://reactos.org" STRING_VOL_HELP3 " Volume Serial Number is %04X-%04X\n" STRING_VOL_HELP4 "Displays the disk volume label and serial number, if they exist.\n\nVOL [drive:]" STRING_WINDOW_HELP1 "change console window aspect\n\n\ -WINDOW [/POS[=]left,top,width,heigth]\n\ +WINDOW [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ /POS specify window placement and dimensions\n\ MIN minimize the window\n\ MAX maximize the window\n\ RESTORE restore the window" STRING_WINDOW_HELP2 "change console window aspect\n\n\ -ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ +ACTIVATE 'window' [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ window tile of window on which perform actions\n\ /POS specify window placement and dimensions\n\ diff --git a/base/shell/cmd/lang/es-ES.rc b/base/shell/cmd/lang/es-ES.rc index 3bae0a9794e..8d10735703d 100644 --- a/base/shell/cmd/lang/es-ES.rc +++ b/base/shell/cmd/lang/es-ES.rc @@ -463,7 +463,7 @@ MIN minimiza la ventana\n\ MAX maximiza la ventana\n\ RESTORE restaura la ventana" STRING_WINDOW_HELP2 "Cambia el aspecto de la ventana de la consola.\n\n\ -ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ +ACTIVATE 'window' [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ window Título de la ventana en la que realizar las acciónes\n\ /POS Especifica la posición y dimensión de la ventana\n\ diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc index 7623e6208af..2d129e3fadd 100644 --- a/base/shell/cmd/lang/id-ID.rc +++ b/base/shell/cmd/lang/id-ID.rc @@ -447,14 +447,14 @@ Pemutakiran tersedia di: https://reactos.org" STRING_VOL_HELP3 " Nomor Seri Volume adalah %04X-%04X\n" STRING_VOL_HELP4 "Menampilkan label dan nomor seri volume disk, jika ada.\n\nVOL [drive:]" STRING_WINDOW_HELP1 "mengubah aspek jendela konsol\n\n\ -WINDOW [/POS[=]left,top,width,heigth]\n\ +WINDOW [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ /POS menetapkan penempatan dan dimensi jendela\n\ MIN mengecilkan jendela\n\ MAX memaksimalkan jendela\n\ RESTORE mengembalikan jendela" STRING_WINDOW_HELP2 "mengubah aspek jendela konsol\n\n\ -ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ +ACTIVATE 'window' [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ window tile jendela yang melakukan aksi\n\ /POS menetapkan penempatan dan dimensi jendela\n\ diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc index 20361769681..4bbb420d202 100644 --- a/base/shell/cmd/lang/pl-PL.rc +++ b/base/shell/cmd/lang/pl-PL.rc @@ -453,14 +453,14 @@ Uaktualnienia dostępne na stronie: https://reactos.org" STRING_VOL_HELP3 " Numer seryjny woluminu to: %04X-%04X\n" STRING_VOL_HELP4 "Wyświetla etykietę woluminu w danym napędzie (o ile istnieje) i jego numer seryjny.\n\nVOL [napęd:]" STRING_WINDOW_HELP1 "Zmienia wymiar i pozycję danego okna konsoli\n\n\ -WINDOW [/POS[=]left,top,width,heigth]\n\ +WINDOW [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['tytuł']\n\n\ /POS określa położenie i rozmiary okna\n\ MIN minimalizuje okno\n\ MAX maksymalizuje okno\n\ RESTORE odtwarza standardowe ustawienia okna" STRING_WINDOW_HELP2 "Zmienia wymiar i pozycję określonego okna konsoli\n\n\ -ACTIVATE 'tytuł' [/POS[=]left,top,width,heigth]\n\ +ACTIVATE 'tytuł' [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['nowy_tytuł']\n\n\ window tytuł okna, na którym zostaną przeprowadzone zmiany\n\ /POS określa położenie i rozmiary okna\n\ diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc index eccaa057f3b..75955a903db 100644 --- a/base/shell/cmd/lang/sk-SK.rc +++ b/base/shell/cmd/lang/sk-SK.rc @@ -454,14 +454,14 @@ Aktualizácie sú dostupné na: https://reactos.org" STRING_VOL_HELP3 " Volume Serial Number is %04X-%04X\n" STRING_VOL_HELP4 "Displays the disk volume label and serial number, if they exist.\n\nVOL [drive:]" STRING_WINDOW_HELP1 "change console window aspect\n\n\ -WINDOW [/POS[=]left,top,width,heigth]\n\ +WINDOW [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ /POS specify window placement and dimensions\n\ MIN minimalizovať okno\n\ MAX maximalizujte okno\n\ RESTORE obnoviť okno" STRING_WINDOW_HELP2 "change console window aspect\n\n\ -ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ +ACTIVATE 'window' [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ window tile of window on which perform actions\n\ /POS specify window placement and dimensions\n\ diff --git a/base/shell/cmd/lang/sq-AL.rc b/base/shell/cmd/lang/sq-AL.rc index 6149ab9da4a..65a852dac54 100644 --- a/base/shell/cmd/lang/sq-AL.rc +++ b/base/shell/cmd/lang/sq-AL.rc @@ -452,14 +452,14 @@ Updates janë në dispozicion në: https://reactos.org" STRING_VOL_HELP3 " Numri Serial i Volumit është %04X-%04X\n" STRING_VOL_HELP4 "Shfaq etiketa e volumeve të diskut, nëse ekzistojne.\n\nVOL [drive:]" STRING_WINDOW_HELP1 "ndrysho aspektin e dritares se konsolit\n\n\ -WINDOW [/POS[=]left,top,width,heigth]\n\ +WINDOW [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['titulli']\n\n\ /POS specifikojë vendosje e dritares dhe dimensionet\n\ MIN minimizo dritaren\n\ MAX rrit dritaren\n\ RESTORE riktheni dritaren" STRING_WINDOW_HELP2 "ndrysho aspektin e dritares se konsolit\n\n\ -ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ +ACTIVATE 'window' [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ window dritare ku mund te kryesh veprime\n\ /POS specifikojë vendosje e dritares dhe dimensionet\n\ diff --git a/base/shell/cmd/lang/uk-UA.rc b/base/shell/cmd/lang/uk-UA.rc index 62eb7db3de0..ece8cafbed2 100644 --- a/base/shell/cmd/lang/uk-UA.rc +++ b/base/shell/cmd/lang/uk-UA.rc @@ -458,14 +458,14 @@ VER [/C][/R][/W]\n\n\ STRING_VOL_HELP3 " Серiйний номер тому: %04X-%04X\n" STRING_VOL_HELP4 "Виводить мiтку тому та серiйний номер, якщо вони iснують.\n\nVOL [диск:]" STRING_WINDOW_HELP1 "змiнює вигляд вiкна консолi\n\n\ -WINDOW [/POS[=]left,top,width,heigth]\n\ +WINDOW [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['заголовок']\n\n\ /POS визначає розміри та розмiщення вiкна\n\ MIN згортає вiкно\n\ MAX розгортає вiкно\n\ RESTORE вiдновлює вiкно" STRING_WINDOW_HELP2 "змiнює вигляд вiкна консолi\n\n\ -ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ +ACTIVATE 'window' [/POS[=]left,top,width,height]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ window заголовок вiкна, вигляд якого треба змiнити\n\ /POS визначає розміри та розмiщення вiкна\n\ diff --git a/modules/rostests/tests/combotst/combotst.c b/modules/rostests/tests/combotst/combotst.c index aeed18d159a..592eeb716eb 100644 --- a/modules/rostests/tests/combotst/combotst.c +++ b/modules/rostests/tests/combotst/combotst.c @@ -388,8 +388,8 @@ WndProc ( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) Buttons[i++] = CreatePushButton("Width +",70,100,WS_VISIBLE); Buttons[i++] = CreatePushButton("Width -",70,101,WS_VISIBLE); - Buttons[i++] = CreatePushButton("Heigth +",70,102,WS_VISIBLE); - Buttons[i++] = CreatePushButton("Heigth -",70,103,WS_VISIBLE); + Buttons[i++] = CreatePushButton("Height +",70,102,WS_VISIBLE); + Buttons[i++] = CreatePushButton("Height -",70,103,WS_VISIBLE); Buttons[i++] = CreatePushButton("CreateWindowA",CHECKBUTWIDTH,CREATEWINDOW_ID,WS_VISIBLE); Buttons[i++] = CreatePushButton("CreateWindowExA",CHECKBUTWIDTH,CREATEWINDOWEX_ID,WS_VISIBLE); diff --git a/modules/rostests/tests/edit/edittest.c b/modules/rostests/tests/edit/edittest.c index 75a2e676fdd..086578fdab7 100644 --- a/modules/rostests/tests/edit/edittest.c +++ b/modules/rostests/tests/edit/edittest.c @@ -383,8 +383,8 @@ WndProc ( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) Buttons[i++] = CreatePushButton("Width +",70,100,WS_VISIBLE); Buttons[i++] = CreatePushButton("Width -",70,101,WS_VISIBLE); - Buttons[i++] = CreatePushButton("Heigth +",70,102,WS_VISIBLE); - Buttons[i++] = CreatePushButton("Heigth -",70,103,WS_VISIBLE); + Buttons[i++] = CreatePushButton("Height +",70,102,WS_VISIBLE); + Buttons[i++] = CreatePushButton("Height -",70,103,WS_VISIBLE); Buttons[i++] = CreatePushButton("CreateWindowA",140,CREATEWINDOW,WS_VISIBLE); Buttons[i++] = CreatePushButton("CreateWindowExA",140,CREATEWINDOWEX,WS_VISIBLE);

1 year, 5 months

[reactos] 01/01: [BROWSEUI] Refactor settings and sync them between windows (#5496)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=43b3dc20341682ffe1f5b… commit 43b3dc20341682ffe1f5b29e28b023f5843952b3 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Thu Aug 17 03:14:41 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 17 12:14:41 2023 +0300 [BROWSEUI] Refactor settings and sync them between windows (#5496) This works similarly to how our shell stores its settings from a software design standpoint. - Add settings.cpp file and ShellSettings structure to load and save settings. - Add a registry value to hivedef.inf for the locked toolbar state. This prevents a bug where the associated registry key cannot be opened or saved to. - Add new BWM_SETTINGCHANGE window message to refresh the UI on setting changes and send it to every open window when saving settings to the registry. - Add new BWM_GETSETTINGSPTR window message to share the shellbrowser settings structure pointer with child windows and toolbars. --- boot/bootdata/hivedef.inf | 1 + dll/win32/browseui/CMakeLists.txt | 1 + dll/win32/browseui/internettoolbar.cpp | 92 +++++++++++++++++----------------- dll/win32/browseui/internettoolbar.h | 4 ++ dll/win32/browseui/precomp.h | 14 ++++++ dll/win32/browseui/settings.cpp | 36 +++++++++++++ dll/win32/browseui/shellbrowser.cpp | 66 ++++++++++++++---------- 7 files changed, 141 insertions(+), 73 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 6394246fad9..6551f5a7701 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -1902,6 +1902,7 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","ShowSuperHid HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CabinetState",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CabinetState","FullPath",0x00010003,0 HKCU,"SOFTWARE\Microsoft\Internet Explorer\Main","StatusBarOther",0x00010003,1 +HKCU,"SOFTWARE\Microsoft\Internet Explorer\Toolbar","Locked",0x00010003,1 ; ComDlg32 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\ComDlg32",,0x00000012 diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt index 8b9eb4ebd3d..83a78e085dc 100644 --- a/dll/win32/browseui/CMakeLists.txt +++ b/dll/win32/browseui/CMakeLists.txt @@ -30,6 +30,7 @@ list(APPEND SOURCE internettoolbar.cpp parsecmdline.cpp regtreeoptions.cpp + settings.cpp shellbrowser.cpp toolsband.cpp travellog.cpp diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index 8d51ad6bcfe..b9d3b6273b7 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -250,11 +250,11 @@ HRESULT CDockSite::GetRBBandInfo(REBARBANDINFOW &bandInfo) bandInfo.fStyle |= RBBS_BREAK; if (fDeskBandInfo.dwModeFlags & DBIMF_TOPALIGN) bandInfo.fStyle |= RBBS_TOPALIGN; - if (fFlags & ITF_NOGRIPPER || fToolbar->fLocked) + if (fFlags & ITF_NOGRIPPER || fToolbar->pSettings->fLocked) bandInfo.fStyle |= RBBS_NOGRIPPER; if (fFlags & ITF_NOTITLE) bandInfo.fStyle |= RBBS_HIDETITLE; - if (fFlags & ITF_GRIPPERALWAYS && !fToolbar->fLocked) + if (fFlags & ITF_GRIPPERALWAYS && !fToolbar->pSettings->fLocked) bandInfo.fStyle |= RBBS_GRIPPERALWAYS; if (fFlags & ITF_FIXEDSIZE) bandInfo.fStyle |= RBBS_FIXEDSIZE; @@ -607,17 +607,13 @@ HRESULT STDMETHODCALLTYPE CMenuCallback::CallbackSM(LPSMDATA psmd, UINT uMsg, WP CInternetToolbar::CInternetToolbar() { - fLocked = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Toolbar", - L"Locked", - FALSE, - TRUE); - fMainReBar = NULL; fMenuBandWindow = NULL; fNavigationWindow = NULL; fMenuCallback = new CComObject<CMenuCallback>(); fToolbarWindow = NULL; fAdviseCookie = 0; + pSettings = NULL; } CInternetToolbar::~CInternetToolbar() @@ -714,45 +710,40 @@ HRESULT CInternetToolbar::CreateMenuBar(IShellMenu **pMenuBar) } HRESULT CInternetToolbar::LockUnlockToolbars(bool locked) +{ + if (locked != pSettings->fLocked) + { + pSettings->fLocked = locked; + pSettings->Save(); + RefreshLockedToolbarState(); + } + return S_OK; +} + +void CInternetToolbar::RefreshLockedToolbarState() { REBARBANDINFOW rebarBandInfo; int bandCount; CDockSite *dockSite; - HRESULT hResult; - if (locked != fLocked) + rebarBandInfo.cbSize = sizeof(rebarBandInfo); + rebarBandInfo.fMask = RBBIM_STYLE | RBBIM_LPARAM; + bandCount = (int)SendMessage(fMainReBar, RB_GETBANDCOUNT, 0, 0); + for (INT x = 0; x < bandCount; x++) { - DWORD dwLocked = locked ? 1 : 0; - SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Toolbar", - L"Locked", - REG_DWORD, - &dwLocked, - sizeof(dwLocked), - SHREGSET_FORCE_HKCU); - fLocked = locked; - - rebarBandInfo.cbSize = sizeof(rebarBandInfo); - rebarBandInfo.fMask = RBBIM_STYLE | RBBIM_LPARAM; - bandCount = (int)SendMessage(fMainReBar, RB_GETBANDCOUNT, 0, 0); - for (INT x = 0; x < bandCount; x++) + SendMessage(fMainReBar, RB_GETBANDINFOW, x, (LPARAM)&rebarBandInfo); + dockSite = reinterpret_cast<CDockSite *>(rebarBandInfo.lParam); + if (dockSite != NULL) { - SendMessage(fMainReBar, RB_GETBANDINFOW, x, (LPARAM)&rebarBandInfo); - dockSite = reinterpret_cast<CDockSite *>(rebarBandInfo.lParam); - if (dockSite != NULL) - { - rebarBandInfo.fStyle &= ~(RBBS_NOGRIPPER | RBBS_GRIPPERALWAYS); - if (dockSite->fFlags & CDockSite::ITF_NOGRIPPER || fLocked) - rebarBandInfo.fStyle |= RBBS_NOGRIPPER; - if (dockSite->fFlags & CDockSite::ITF_GRIPPERALWAYS && !fLocked) - rebarBandInfo.fStyle |= RBBS_GRIPPERALWAYS; - SendMessage(fMainReBar, RB_SETBANDINFOW, x, (LPARAM)&rebarBandInfo); - } + rebarBandInfo.fStyle &= ~(RBBS_NOGRIPPER | RBBS_GRIPPERALWAYS); + if (dockSite->fFlags & CDockSite::ITF_NOGRIPPER || pSettings->fLocked) + rebarBandInfo.fStyle |= RBBS_NOGRIPPER; + if (dockSite->fFlags & CDockSite::ITF_GRIPPERALWAYS && !pSettings->fLocked) + rebarBandInfo.fStyle |= RBBS_GRIPPERALWAYS; + SendMessage(fMainReBar, RB_SETBANDINFOW, x, (LPARAM)&rebarBandInfo); } - hResult = ReserveBorderSpace(0); - - // TODO: refresh view menu? } - return S_OK; + ReserveBorderSpace(0); } HRESULT CInternetToolbar::SetState(const GUID *pguidCmdGroup, long commandID, OLECMD* pcmd) @@ -980,7 +971,7 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::ResizeBorderDW(LPCRECT prcBorder, ::GetWindowRect(fMainReBar, &availableBorderSpace); neededBorderSpace.left = 0; neededBorderSpace.top = availableBorderSpace.bottom - availableBorderSpace.top; - if (!fLocked) + if (!pSettings->fLocked) neededBorderSpace.top += 3; neededBorderSpace.right = 0; neededBorderSpace.bottom = 0; @@ -1145,7 +1136,7 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::QueryStatus(const GUID *pguidCmdGrou break; case ITID_TOOLBARLOCKED: // lock toolbars prgCmds->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED; - if (fLocked) + if (pSettings->fLocked) prgCmds->cmdf |= OLECMDF_LATCHED; break; default: @@ -1184,7 +1175,7 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::Exec(const GUID *pguidCmdGroup, DWOR // run customize return S_OK; case ITID_TOOLBARLOCKED: - return LockUnlockToolbars(!fLocked); + return LockUnlockToolbars(!pSettings->fLocked); } } return E_FAIL; @@ -1356,6 +1347,9 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::SetSite(IUnknown *pUnkSite) if (ownerWindow == NULL) return E_FAIL; + // Get settings from owner window + ::SendMessageW(ownerWindow, BWM_GETSETTINGSPTR, 0, (LPARAM)&pSettings); + // create dock container fSite = pUnkSite; dockContainer = SHCreateWorkerWindowW(0, ownerWindow, 0, @@ -1682,7 +1676,6 @@ LRESULT CInternetToolbar::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, RBHITTESTINFO hitTestInfo; REBARBANDINFOW rebarBandInfo; int bandID; - BOOL goButtonChecked; clickLocation.x = LOWORD(lParam); clickLocation.y = HIWORD(lParam); @@ -1727,9 +1720,8 @@ LRESULT CInternetToolbar::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, SHCheckMenuItem(contextMenu, IDM_TOOLBARS_ADDRESSBAR, IsBandVisible(ITBBID_ADDRESSBAND) == S_OK); SHCheckMenuItem(contextMenu, IDM_TOOLBARS_LINKSBAR, FALSE); SHCheckMenuItem(contextMenu, IDM_TOOLBARS_CUSTOMIZE, FALSE); - SHCheckMenuItem(contextMenu, IDM_TOOLBARS_LOCKTOOLBARS, fLocked); - goButtonChecked = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", FALSE, TRUE); - SHCheckMenuItem(contextMenu, IDM_TOOLBARS_GOBUTTON, goButtonChecked); + SHCheckMenuItem(contextMenu, IDM_TOOLBARS_LOCKTOOLBARS, pSettings->fLocked); + SHCheckMenuItem(contextMenu, IDM_TOOLBARS_GOBUTTON, pSettings->fShowGoButton); // TODO: use GetSystemMetrics(SM_MENUDROPALIGNMENT) to determine menu alignment command = TrackPopupMenu(contextMenu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, @@ -1745,7 +1737,7 @@ LRESULT CInternetToolbar::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, case IDM_TOOLBARS_LINKSBAR: // links break; case IDM_TOOLBARS_LOCKTOOLBARS: // lock the toolbars - LockUnlockToolbars(!fLocked); + LockUnlockToolbars(!pSettings->fLocked); break; case IDM_TOOLBARS_CUSTOMIZE: // customize SendMessage(fToolbarWindow, TB_CUSTOMIZE, 0, 0); @@ -1850,7 +1842,7 @@ LRESULT CInternetToolbar::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL LRESULT CInternetToolbar::OnLDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { bHandled = FALSE; - if (fLocked) + if (pSettings->fLocked) return 0; if (wParam & MK_CONTROL) @@ -1928,3 +1920,11 @@ LRESULT CInternetToolbar::OnWinIniChange(UINT uMsg, WPARAM wParam, LPARAM lParam return lres; } + +LRESULT CInternetToolbar::OnSettingsChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + /* Refresh toolbar locked state */ + RefreshLockedToolbarState(); + + return 0; +} diff --git a/dll/win32/browseui/internettoolbar.h b/dll/win32/browseui/internettoolbar.h index e824df72b19..0b154ab07b0 100644 --- a/dll/win32/browseui/internettoolbar.h +++ b/dll/win32/browseui/internettoolbar.h @@ -92,6 +92,7 @@ public: BOOL fSizing; POINT fStartPosition; LONG fStartHeight; + ShellSettings *pSettings; public: CInternetToolbar(); virtual ~CInternetToolbar(); @@ -105,6 +106,7 @@ public: HRESULT IsBandVisible(int BandID); HRESULT ToggleBandVisibility(int BandID); HRESULT SetState(const GUID *pguidCmdGroup, long commandID, OLECMD* pcmd); + void RefreshLockedToolbarState(); public: // *** IInputObject specific methods *** @@ -200,6 +202,7 @@ public: LRESULT OnLUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnWinIniChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnSettingsChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); BEGIN_MSG_MAP(CInternetToolbar) COMMAND_ID_HANDLER(IDM_GOTO_BACK, OnTravelBack) @@ -221,6 +224,7 @@ public: MESSAGE_HANDLER(WM_LBUTTONUP, OnLUp) MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) MESSAGE_HANDLER(WM_WININICHANGE, OnWinIniChange) + MESSAGE_HANDLER(BWM_SETTINGCHANGE, OnSettingsChange) END_MSG_MAP() DECLARE_REGISTRY_RESOURCEID(IDR_INTERNETTOOLBAR) diff --git a/dll/win32/browseui/precomp.h b/dll/win32/browseui/precomp.h index 67fe4c33208..c3c26e7115d 100644 --- a/dll/win32/browseui/precomp.h +++ b/dll/win32/browseui/precomp.h @@ -37,6 +37,10 @@ #include "resource.h" +#define BWM_SETTINGCHANGE (WM_USER + 300) +#define BWM_GETSETTINGSPTR (WM_USER + 301) +struct ShellSettings; + #include "ACLCustomMRU.h" #include "aclhistory.h" #include "aclistisf.h" @@ -65,4 +69,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui); +struct ShellSettings +{ + BOOL fLocked = FALSE; + BOOL fShowGoButton = FALSE; + BOOL fStatusBarVisible = FALSE; + + BOOL Save(); + BOOL Load(); +}; + #endif /* _BROWSEUI_PCH_ */ diff --git a/dll/win32/browseui/settings.cpp b/dll/win32/browseui/settings.cpp new file mode 100644 index 00000000000..de7e6c04480 --- /dev/null +++ b/dll/win32/browseui/settings.cpp @@ -0,0 +1,36 @@ +/* + * PROJECT: ReactOS browseui + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Stores settings for the file explorer UI. + * COPYRIGHT: Copyright 2023 Carl Bialorucki <cbialo2(a)outlook.com> + */ + +#include "precomp.h" + +BOOL ShellSettings::Save() +{ + SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"StatusBarOther", + REG_DWORD, &fStatusBarVisible, sizeof(fStatusBarVisible), SHREGSET_FORCE_HKCU); + + SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", + REG_DWORD, &fShowGoButton, sizeof(fShowGoButton), SHREGSET_FORCE_HKCU); + + SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Toolbar", L"Locked", + REG_DWORD, &fLocked, sizeof(fLocked), SHREGSET_FORCE_HKCU); + + return TRUE; +} + +BOOL ShellSettings::Load() +{ + fStatusBarVisible = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", + L"StatusBarOther", FALSE, FALSE); + + fShowGoButton = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", + L"ShowGoButton", FALSE, TRUE); + + fLocked = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Toolbar", + L"Locked", FALSE, TRUE); + + return TRUE; +} diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 0c808c29e25..0f1e3814ebe 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -292,7 +292,6 @@ private: CComPtr<IShellView> fCurrentShellView; // LPITEMIDLIST fCurrentDirectoryPIDL; // HWND fStatusBar; - bool fStatusBarVisible; CToolbarProxy fToolbarProxy; barInfo fClientBars[3]; CComPtr<ITravelLog> fTravelLog; @@ -306,6 +305,7 @@ private: IBindCtx *fHistoryBindContext; HDSA menuDsa; HACCEL m_hAccel; + ShellSettings m_settings; public: #if 0 ULONG InternalAddRef() @@ -350,7 +350,7 @@ public: HRESULT UpdateUpState(); void UpdateGotoMenu(HMENU theMenu); void UpdateViewMenu(HMENU theMenu); - void LoadSettings(); + void LoadCabinetState(); /* // *** IDockingWindowFrame methods *** virtual HRESULT STDMETHODCALLTYPE AddToolbar(IUnknown *punkSrc, LPCWSTR pwszItem, DWORD dwAddFlags); @@ -624,6 +624,8 @@ public: LRESULT OnRefresh(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnExplorerBar(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT RelayCommands(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnSettingsChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnGetSettingsPtr(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); HRESULT OnSearch(); static ATL::CWndClassInfo& GetWndClassInfo() @@ -674,6 +676,8 @@ public: COMMAND_RANGE_HANDLER(IDM_GOTO_TRAVEL_FIRSTTARGET, IDM_GOTO_TRAVEL_LASTTARGET, OnGoTravel) COMMAND_RANGE_HANDLER(IDM_EXPLORERBAND_BEGINCUSTOM, IDM_EXPLORERBAND_ENDCUSTOM, OnExplorerBar) MESSAGE_HANDLER(WM_COMMAND, RelayCommands) + MESSAGE_HANDLER(BWM_SETTINGCHANGE, OnSettingsChange) + MESSAGE_HANDLER(BWM_GETSETTINGSPTR, OnGetSettingsPtr) END_MSG_MAP() BEGIN_CONNECTION_POINT_MAP(CShellBrowser) @@ -714,6 +718,7 @@ CShellBrowser::CShellBrowser() fHistoryObject = NULL; fHistoryStream = NULL; fHistoryBindContext = NULL; + m_settings.Load(); } CShellBrowser::~CShellBrowser() @@ -783,11 +788,11 @@ HRESULT CShellBrowser::Initialize() fToolbarProxy.Initialize(m_hWnd, clientBar); - LoadSettings(); + LoadCabinetState(); // create status bar DWORD dwStatusStyle = WS_CHILD | WS_CLIPSIBLINGS | SBARS_SIZEGRIP | SBARS_TOOLTIPS; - if (fStatusBarVisible) + if (m_settings.fStatusBarVisible) dwStatusStyle |= WS_VISIBLE; fStatusBar = ::CreateWindowExW(0, STATUSCLASSNAMEW, NULL, dwStatusStyle, 0, 0, 500, 20, m_hWnd, (HMENU)IDC_STATUSBAR, @@ -1449,7 +1454,7 @@ void CShellBrowser::RepositionBars() GetClientRect(&clientRect); - if (fStatusBarVisible && fStatusBar) + if (m_settings.fStatusBarVisible && fStatusBar) { ::GetWindowRect(fStatusBar, &statusRect); ::SetWindowPos(fStatusBar, NULL, clientRect.left, clientRect.bottom - (statusRect.bottom - statusRect.top), @@ -1517,13 +1522,8 @@ void CShellBrowser::RepositionBars() clientRect.bottom - clientRect.top, SWP_NOOWNERZORDER | SWP_NOZORDER); } -void CShellBrowser::LoadSettings() +void CShellBrowser::LoadCabinetState() { - fStatusBarVisible = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", - L"StatusBarOther", - FALSE, - FALSE); - fCabinetState.fFullPathTitle = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", L"FullPath", FALSE, @@ -1757,7 +1757,7 @@ void CShellBrowser::UpdateViewMenu(HMENU theMenu) menuItemInfo.hSubMenu = toolbarMenu; SetMenuItemInfo(theMenu, IDM_VIEW_TOOLBARS, FALSE, &menuItemInfo); } - SHCheckMenuItem(theMenu, IDM_VIEW_STATUSBAR, fStatusBarVisible ? TRUE : FALSE); + SHCheckMenuItem(theMenu, IDM_VIEW_STATUSBAR, m_settings.fStatusBarVisible ? TRUE : FALSE); } HRESULT CShellBrowser::BuildExplorerBandMenu() @@ -3681,21 +3681,9 @@ LRESULT CShellBrowser::OnOrganizeFavorites(WORD wNotifyCode, WORD wID, HWND hWnd LRESULT CShellBrowser::OnToggleStatusBarVisible(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - fStatusBarVisible = !fStatusBarVisible; - if (fStatusBar) - { - ::ShowWindow(fStatusBar, fStatusBarVisible ? SW_SHOW : SW_HIDE); - RepositionBars(); - } - - DWORD dwStatusBarVisible = fStatusBarVisible; - SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", - L"StatusBarOther", - REG_DWORD, - &dwStatusBarVisible, - sizeof(dwStatusBarVisible), - SHREGSET_FORCE_HKCU); - + m_settings.fStatusBarVisible = !m_settings.fStatusBarVisible; + m_settings.Save(); + SendMessageW(BWM_SETTINGCHANGE, 0, (LPARAM)&m_settings); return 0; } @@ -3800,6 +3788,30 @@ LRESULT CShellBrowser::RelayCommands(UINT uMsg, WPARAM wParam, LPARAM lParam, BO return 0; } +LRESULT CShellBrowser::OnSettingsChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + /* Refresh child windows */ + ::SendMessageW(fClientBars[BIInternetToolbar].hwnd, uMsg, wParam, lParam); + + /* Refresh status bar */ + if (fStatusBar) + { + ::ShowWindow(fStatusBar, m_settings.fStatusBarVisible ? SW_SHOW : SW_HIDE); + RepositionBars(); + } + + return 0; +} + +LRESULT CShellBrowser::OnGetSettingsPtr(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (!lParam) + return ERROR_INVALID_PARAMETER; + + *(ShellSettings**)lParam = &m_settings; + return NO_ERROR; +} + HRESULT CShellBrowser_CreateInstance(REFIID riid, void **ppv) { return ShellObjectCreatorInit<CShellBrowser>(riid, ppv);

1 year, 5 months

[reactos] 01/01: [KERNEL32] CreateProcessInternalW(): Always use Peb variable

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8888311452009a409673a… commit 8888311452009a409673adf16d99832ff7e5fe71 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Aug 17 02:51:09 2023 +0200 Commit: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> CommitDate: Thu Aug 17 02:51:09 2023 +0200 [KERNEL32] CreateProcessInternalW(): Always use Peb variable Trivial consistency/optimization. Addendum to d81cd01 (r59637). --- dll/win32/kernel32/client/proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index fdfd390395e..9f1f1c1a4a0 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -3555,7 +3555,7 @@ StartScan: /* If the process is being debugged, only read IFEO if the PEB says so */ if (!(dwCreationFlags & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS)) || - (NtCurrentPeb()->ReadImageFileExecOptions)) + (Peb->ReadImageFileExecOptions)) { /* Let's do this! Attempt to open IFEO */ IFEOStatus = LdrOpenImageFileOptionsKey(&PathName, 0, &KeyHandle);

1 year, 5 months

[reactos] 01/01: [KERNEL32] Fix startup context of initial thread

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5645f7cf8f5b9f41de782… commit 5645f7cf8f5b9f41de782535081983db0a7cfb35 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 14 22:03:00 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Aug 16 22:03:05 2023 +0300 [KERNEL32] Fix startup context of initial thread When creating a new process the monster function CreateProcessInternalW calls BaseInitializeContext to set up the context for the initial thread. One of the parameters is the PEB pointer. Instead of passing the pointer to the newly created process' PEB, the function was passing it's own PEB address, leading to test failures. How this is not an issue otherwise is a mystery to be resolved by someone else. Also remove ros_skip_flaky marks in kernel32_winetest:process (yes, flaky, because sometimes the PEB addresses actually match) --- dll/win32/kernel32/client/proc.c | 2 +- modules/rostests/winetests/kernel32/process.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index 5a8c78c1364..fdfd390395e 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -4181,7 +4181,7 @@ StartScan: /* Create the Thread's Context */ BaseInitializeContext(&Context, - Peb, + RemotePeb, ImageInformation.TransferAddress, InitialTeb.StackBase, 0); diff --git a/modules/rostests/winetests/kernel32/process.c b/modules/rostests/winetests/kernel32/process.c index 2944c9bf4cb..9a9a583ff53 100644 --- a/modules/rostests/winetests/kernel32/process.c +++ b/modules/rostests/winetests/kernel32/process.c @@ -3439,9 +3439,7 @@ static void test_SuspendProcessState(void) #endif ret = ReadProcessMemory( pi.hProcess, peb_ptr, &child_peb, sizeof(child_peb), NULL ); - ros_skip_flaky ok( ret, "Failed to read PEB (%u)\n", GetLastError() ); - ros_skip_flaky ok( child_peb.ImageBaseAddress == exe_base, "wrong base %p/%p\n", child_peb.ImageBaseAddress, exe_base ); ok( entry_ptr == (char *)exe_base + nt_header.OptionalHeader.AddressOfEntryPoint,

1 year, 5 months

[reactos] 01/01: [SHLWAPI][SDK] Rewrite SHGet/SHSetIniStringW in C++ (#5561)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf55034cdf3cb3adfb8e2… commit cf55034cdf3cb3adfb8e2b256ad720b555999522 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 16 07:13:14 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 16 07:13:14 2023 +0900 [SHLWAPI][SDK] Rewrite SHGet/SHSetIniStringW in C++ (#5561) - Follow-up to #5547. Move SHGetIniStringW / SHSetIniStringW into propbag.cpp. - Rewrite them in C++. CORE-9283 --- dll/win32/shlwapi/ordinal.c | 103 +------------------------------- dll/win32/shlwapi/propbag.cpp | 113 ++++++++++++++++++++++++++++++++++++ sdk/include/reactos/shlwapi_undoc.h | 13 ++++- 3 files changed, 127 insertions(+), 102 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index a151d4dce00..6f8855fd10a 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -3272,6 +3272,7 @@ BOOL WINAPI PlaySoundWrapW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound) return PlaySoundW(pszSound, hmod, fdwSound); } +#ifndef __REACTOS__ /* See propbag.cpp */ /************************************************************************* * @ [SHLWAPI.294] * @@ -3291,37 +3292,6 @@ BOOL WINAPI PlaySoundWrapW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound) DWORD WINAPI SHGetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPWSTR out, DWORD outLen, LPCWSTR filename) { -#ifdef __REACTOS__ - WCHAR szSection[MAX_PATH + 2]; - WCHAR szWideBuff[MAX_PATH]; - CHAR szUtf7Buff[MAX_PATH]; - - TRACE("(%s,%s,%p,%08x,%s)\n", debugstr_w(appName), debugstr_w(keyName), - out, outLen, debugstr_w(filename)); - - if (outLen == 0) - return 0; - - /* Try ".W"-appended section name. See also SHSetIniStringW. */ - lstrcpynW(szSection, appName, _countof(szSection) - 2); - lstrcatW(szSection, L".W"); - GetPrivateProfileStringW(szSection, keyName, NULL, szWideBuff, _countof(szWideBuff), filename); - if (szWideBuff[0] == UNICODE_NULL) /* It's empty or not found */ - { - /* Try the normal section name */ - return GetPrivateProfileStringW(appName, keyName, NULL, out, outLen, filename); - } - - /* Okay, now ".W" version is valid. Its value is a UTF-7 string in UTF-16 */ - - /* szWideBuff --> szUtf7Buff */ - SHUnicodeToAnsiCP(CP_ACP, szWideBuff, szUtf7Buff, _countof(szUtf7Buff)); - szUtf7Buff[_countof(szUtf7Buff) - 1] = ANSI_NULL; - - /* szUtf7Buff --> out */ - SHAnsiToUnicodeCP(CP_UTF7, szUtf7Buff, out, outLen); - out[outLen - 1] = UNICODE_NULL; -#else INT ret; WCHAR *buf; @@ -3344,27 +3314,12 @@ DWORD WINAPI SHGetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPWSTR out, *out = 0; HeapFree(GetProcessHeap(), 0, buf); -#endif return strlenW(out); } - -#ifdef __REACTOS__ -static BOOL Is7BitClean(LPCWSTR psz) -{ - if (!psz) - return TRUE; - - while (*psz) - { - if (*psz > 0x7F) - return FALSE; - ++psz; - } - return TRUE; -} #endif +#ifndef __REACTOS__ /* See propbag.cpp */ /************************************************************************* * @ [SHLWAPI.295] * @@ -3384,64 +3339,12 @@ static BOOL Is7BitClean(LPCWSTR psz) BOOL WINAPI SHSetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPCWSTR str, LPCWSTR filename) { -#ifdef __REACTOS__ - WCHAR szSection[MAX_PATH + 2]; - WCHAR szWideBuff[MAX_PATH]; - CHAR szUtf7Buff[MAX_PATH]; - - TRACE("(%s, %p, %s, %s)\n", debugstr_w(appName), keyName, debugstr_w(str), - debugstr_w(filename)); - - /* Write a normal profile string. If str was NULL, then key will be deleted */ - if (!WritePrivateProfileStringW(appName, keyName, str, filename)) - return FALSE; - - if (Is7BitClean(str)) - { - /* Delete ".A" version */ - lstrcpynW(szSection, appName, _countof(szSection) - 2); - lstrcatW(szSection, L".A"); - WritePrivateProfileStringW(szSection, keyName, NULL, filename); - - /* Delete ".W" version */ - lstrcpynW(szSection, appName, _countof(szSection) - 2); - lstrcatW(szSection, L".W"); - WritePrivateProfileStringW(szSection, keyName, NULL, filename); - - return TRUE; - } - - /* Now str is not 7-bit clean. It needs UTF-7 encoding in UTF-16. - We write ".A" and ".W"-appended sections. */ - - /* str --> szUtf7Buff */ - SHUnicodeToAnsiCP(CP_UTF7, str, szUtf7Buff, _countof(szUtf7Buff)); - szUtf7Buff[_countof(szUtf7Buff) - 1] = ANSI_NULL; - - /* szUtf7Buff --> szWideBuff */ - SHAnsiToUnicodeCP(CP_ACP, szUtf7Buff, szWideBuff, _countof(szWideBuff)); - szWideBuff[_countof(szWideBuff) - 1] = UNICODE_NULL; - - /* Write ".A" version */ - lstrcpynW(szSection, appName, _countof(szSection) - 2); - lstrcatW(szSection, L".A"); - if (!WritePrivateProfileStringW(szSection, keyName, str, filename)) - return FALSE; - - /* Write ".W" version */ - lstrcpynW(szSection, appName, _countof(szSection) - 2); - lstrcatW(szSection, L".W"); - if (!WritePrivateProfileStringW(szSection, keyName, szWideBuff, filename)) - return FALSE; - - return TRUE; -#else TRACE("(%s, %p, %s, %s)\n", debugstr_w(appName), keyName, debugstr_w(str), debugstr_w(filename)); return WritePrivateProfileStringW(appName, keyName, str, filename); -#endif } +#endif /************************************************************************* * @ [SHLWAPI.313] diff --git a/dll/win32/shlwapi/propbag.cpp b/dll/win32/shlwapi/propbag.cpp index f9951324d0c..28e22736d5d 100644 --- a/dll/win32/shlwapi/propbag.cpp +++ b/dll/win32/shlwapi/propbag.cpp @@ -12,6 +12,7 @@ #include <atlstr.h> // for CStringW #include <atlsimpcoll.h> // for CSimpleMap #include <atlcomcli.h> // for CComVariant +#include <atlconv.h> // for CA2W and CW2A WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -580,3 +581,115 @@ SHCreatePropertyBagOnRegKey( return pRegBag->QueryInterface(riid, ppvObj); } + +/************************************************************************** + * SHGetIniStringW (SHLWAPI.294) + * + * @see https://source.winehq.org/WineAPI/SHGetIniStringW.html + */ +EXTERN_C DWORD WINAPI +SHGetIniStringW( + _In_z_ LPCWSTR appName, + _In_z_ LPCWSTR keyName, + _Out_writes_to_(outLen, return + 1) LPWSTR out, + _In_ DWORD outLen, + _In_z_ LPCWSTR filename) +{ + TRACE("(%s,%s,%p,%08x,%s)\n", debugstr_w(appName), debugstr_w(keyName), + out, outLen, debugstr_w(filename)); + + if (outLen == 0) + return 0; + + // Try ".W"-appended section name. See also SHSetIniStringW + CStringW szSection(appName); + szSection += L".W"; + CStringW pszWideBuff; + const INT cchWideMax = 4 * MAX_PATH; // UTF-7 needs 4 times length buffer. + GetPrivateProfileStringW(szSection, keyName, NULL, + pszWideBuff.GetBuffer(cchWideMax), cchWideMax, filename); + pszWideBuff.ReleaseBuffer(); + + if (pszWideBuff.IsEmpty()) // It's empty or not found + { + // Try the normal section name + return GetPrivateProfileStringW(appName, keyName, NULL, out, outLen, filename); + } + + // Okay, now ".W" version is valid. Its value is a UTF-7 string in UTF-16 + CW2A wide2utf7(pszWideBuff); + MultiByteToWideChar(CP_UTF7, 0, wide2utf7, -1, out, outLen); + out[outLen - 1] = UNICODE_NULL; + + return lstrlenW(out); +} + +static BOOL Is7BitClean(LPCWSTR psz) +{ + if (!psz) + return TRUE; + + while (*psz) + { + if (*psz > 0x7F) + return FALSE; + ++psz; + } + return TRUE; +} + +/************************************************************************** + * SHSetIniStringW (SHLWAPI.295) + * + * @see https://source.winehq.org/WineAPI/SHSetIniStringW.html + */ +EXTERN_C BOOL WINAPI +SHSetIniStringW( + _In_z_ LPCWSTR appName, + _In_z_ LPCWSTR keyName, + _In_opt_z_ LPCWSTR str, + _In_z_ LPCWSTR filename) +{ + TRACE("(%s, %p, %s, %s)\n", debugstr_w(appName), keyName, debugstr_w(str), + debugstr_w(filename)); + + // Write a normal profile string. If str was NULL, then key will be deleted + if (!WritePrivateProfileStringW(appName, keyName, str, filename)) + return FALSE; + + if (Is7BitClean(str)) + { + // Delete ".A" version + CStringW szSection(appName); + szSection += L".A"; + WritePrivateProfileStringW(szSection, keyName, NULL, filename); + + // Delete ".W" version + szSection = appName; + szSection += L".W"; + WritePrivateProfileStringW(szSection, keyName, NULL, filename); + + return TRUE; + } + + // Now str is not 7-bit clean. It needs UTF-7 encoding in UTF-16. + // We write ".A" and ".W"-appended sections + CW2A wide2utf7(str, CP_UTF7); + CA2W utf72wide(wide2utf7, CP_ACP); + + BOOL ret = TRUE; + + // Write ".A" version + CStringW szSection(appName); + szSection += L".A"; + if (!WritePrivateProfileStringW(szSection, keyName, str, filename)) + ret = FALSE; + + // Write ".W" version + szSection = appName; + szSection += L".W"; + if (!WritePrivateProfileStringW(szSection, keyName, utf72wide, filename)) + ret = FALSE; + + return ret; +} diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index a2677a639ce..4e01e7c633f 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -180,10 +180,19 @@ HRESULT WINAPI SHLoadRegUIStringW(HKEY hkey, LPCWSTR value, LPWSTR buf, DWORD si #endif DWORD WINAPI -SHGetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPWSTR out, DWORD outLen, LPCWSTR filename); +SHGetIniStringW( + _In_z_ LPCWSTR appName, + _In_z_ LPCWSTR keyName, + _Out_writes_to_(outLen, return + 1) LPWSTR out, + _In_ DWORD outLen, + _In_z_ LPCWSTR filename); BOOL WINAPI -SHSetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPCWSTR str, LPCWSTR filename); +SHSetIniStringW( + _In_z_ LPCWSTR appName, + _In_z_ LPCWSTR keyName, + _In_opt_z_ LPCWSTR str, + _In_z_ LPCWSTR filename); int WINAPIV

1 year, 5 months

[reactos] 01/01: [TASKMGR] Do not disable status bar when opening system menu (#5571)

by Egor Ananyin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d53e953cd19ea11b6ab8… commit 2d53e953cd19ea11b6ab8221e959b2f143be7fb3 Author: Egor Ananyin <ananinegor(a)gmail.com> AuthorDate: Tue Aug 15 22:37:27 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 15 21:37:27 2023 +0200 [TASKMGR] Do not disable status bar when opening system menu (#5571) We do not need to clean the status bar when opening the system menu as it does not show any hints. CORE-19061 --- base/applications/taskmgr/taskmgr.c | 22 ++++++++++++++-------- base/applications/taskmgr/taskmgr.h | 4 ++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/base/applications/taskmgr/taskmgr.c b/base/applications/taskmgr/taskmgr.c index 44bc24b2f96..6cbf8c7994e 100644 --- a/base/applications/taskmgr/taskmgr.c +++ b/base/applications/taskmgr/taskmgr.c @@ -482,14 +482,23 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) TrayIcon_UpdateIcon(); break; + case WM_INITMENUPOPUP: + /* Do not disable the status bar if we opened the system menu */ + if (!HIWORD(lParam)) + TaskManager_DisableStatusBar(hDlg); + else + TaskManager_EnableStatusBar(hDlg); + break; case WM_ENTERMENULOOP: - TaskManager_OnEnterMenuLoop(hDlg); + bInMenuLoop = TRUE; break; case WM_EXITMENULOOP: - TaskManager_OnExitMenuLoop(hDlg); + bInMenuLoop = FALSE; + TaskManager_EnableStatusBar(hDlg); break; case WM_MENUSELECT: - TaskManager_OnMenuSelect(hDlg, LOWORD(wParam), HIWORD(wParam), (HMENU)lParam); + if (!(HIWORD(wParam) & MF_SYSMENU)) + TaskManager_OnMenuSelect(hDlg, LOWORD(wParam), HIWORD(wParam), (HMENU)lParam); break; case WM_SYSCOLORCHANGE: /* Forward WM_SYSCOLORCHANGE to common controls */ @@ -887,24 +896,21 @@ void TaskManager_OnRestoreMainWindow(void) SetWindowPos(hMainWnd, (OnTop ? HWND_TOPMOST : HWND_TOP), 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_SHOWWINDOW); } -void TaskManager_OnEnterMenuLoop(HWND hWnd) +void TaskManager_DisableStatusBar(HWND hWnd) { int nParts; /* Update the status bar pane sizes */ nParts = -1; SendMessageW(hStatusWnd, SB_SETPARTS, 1, (LPARAM) (LPINT)&nParts); - bInMenuLoop = TRUE; SendMessageW(hStatusWnd, SB_SETTEXT, (WPARAM)0, (LPARAM)L""); } -void TaskManager_OnExitMenuLoop(HWND hWnd) +void TaskManager_EnableStatusBar(HWND hWnd) { RECT rc; int nParts[3]; - bInMenuLoop = FALSE; - /* Update the status bar pane sizes */ GetClientRect(hWnd, &rc); nParts[0] = STATUS_SIZE1; diff --git a/base/applications/taskmgr/taskmgr.h b/base/applications/taskmgr/taskmgr.h index 28136f8271c..a3b6220e8b9 100644 --- a/base/applications/taskmgr/taskmgr.h +++ b/base/applications/taskmgr/taskmgr.h @@ -94,8 +94,8 @@ void FillSolidRect(HDC hDC, LPCRECT lpRect, COLORREF clr); void LoadSettings(void); void SaveSettings(void); void TaskManager_OnRestoreMainWindow(void); -void TaskManager_OnEnterMenuLoop(HWND hWnd); -void TaskManager_OnExitMenuLoop(HWND hWnd); +void TaskManager_DisableStatusBar(HWND hWnd); +void TaskManager_EnableStatusBar(HWND hWnd); void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu); void TaskManager_OnViewUpdateSpeed(DWORD); void TaskManager_OnTabWndSelChange(void);

1 year, 5 months

[reactos] 01/01: [FASTFAT][NTDLL_APITEST] Add missing semicolon after _SEH2_END (#5568)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a995d8d614cd149f4d87c… commit a995d8d614cd149f4d87c177f053c177904d1b2f Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Jul 29 18:37:18 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 15 18:16:31 2023 +0200 [FASTFAT][NTDLL_APITEST] Add missing semicolon after _SEH2_END (#5568) Trivial code consistency. --- drivers/filesystems/fastfat/read.c | 2 +- modules/rostests/apitests/ntdll/RtlMultipleAllocateHeap.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/filesystems/fastfat/read.c b/drivers/filesystems/fastfat/read.c index e1003e921d7..54a5894afe2 100644 --- a/drivers/filesystems/fastfat/read.c +++ b/drivers/filesystems/fastfat/read.c @@ -87,7 +87,7 @@ FatOverflowPagingFileRead ( RtlZeroMemory((AT), (BYTE_COUNT)); \ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ FatRaiseStatus( IrpContext, STATUS_INVALID_USER_BUFFER ); \ - } _SEH2_END \ + } _SEH2_END; \ } // diff --git a/modules/rostests/apitests/ntdll/RtlMultipleAllocateHeap.c b/modules/rostests/apitests/ntdll/RtlMultipleAllocateHeap.c index 1ae645facf5..ab98927fb15 100644 --- a/modules/rostests/apitests/ntdll/RtlMultipleAllocateHeap.c +++ b/modules/rostests/apitests/ntdll/RtlMultipleAllocateHeap.c @@ -23,7 +23,7 @@ static FN_RtlMultipleFreeHeap g_free = NULL; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ threw = _SEH2_GetExceptionCode(); \ } \ - _SEH2_END \ + _SEH2_END; \ ok((ret) == (ret_expected), "ret excepted %d, but %d\n", (ret_expected), (ret)); \ ok((err) == (err_expected), "err excepted %d, but %d\n", (err_expected), (err)); \ ok((threw) == (threw_excepted), "threw excepted %d, but %d\n", (threw_excepted), (threw)); @@ -37,7 +37,7 @@ static FN_RtlMultipleFreeHeap g_free = NULL; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ threw = _SEH2_GetExceptionCode(); \ } \ - _SEH2_END \ + _SEH2_END; \ ok((err) == (err_expected), "err excepted %d, but %d", (err_expected), (err)); \ ok((threw) == (threw_excepted), "threw excepted %d, but %d\n", (threw_excepted), (threw)); @@ -50,7 +50,7 @@ static FN_RtlMultipleFreeHeap g_free = NULL; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ threw = _SEH2_GetExceptionCode(); \ } \ - _SEH2_END \ + _SEH2_END; \ ok((ret) == (ret_expected), "ret excepted %d, but %d\n", (ret_expected), (ret)); \ ok((err) == (err_expected), "err excepted %d, but %d\n", (err_expected), (err)); \ ok((threw) == (threw_excepted), "threw excepted %d, but %d\n", (threw_excepted), (threw));

1 year, 5 months

[reactos] 01/01: [NTUSER][USER32] Remove 4 remnant defines (#5572)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=728d5736d944a8cc56cdb… commit 728d5736d944a8cc56cdba253298ff354999fb10 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Aug 13 21:47:01 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 15 18:13:27 2023 +0200 [NTUSER][USER32] Remove 4 remnant defines (#5572) IS_SYSTEM_MENU(): "moved" to ntuser on 6dfa71c (r68904). IS_SYSTEM_POPUP(): uselessly added on 6fc29cc (r8195). IS_BITMAP_ITEM(): uses removed on 07b6ddc (r23221). uselessly copied to ntuser on 6dfa71c (r68904). --- win32ss/user/ntuser/menu.c | 2 -- win32ss/user/user32/windows/menu.c | 8 -------- 2 files changed, 10 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 01740c9c23e..ebade16f1b7 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -60,8 +60,6 @@ BOOL fInEndMenu = FALSE; #define IS_SYSTEM_MENU(MenuInfo) \ (!((MenuInfo)->fFlags & MNF_POPUP) && ((MenuInfo)->fFlags & MNF_SYSMENU)) -#define IS_BITMAP_ITEM(flags) (MF_BITMAP == MENU_ITEM_TYPE(flags)) - #define IS_MAGIC_BITMAP(id) ((id) && ((INT_PTR)(id) < 12) && ((INT_PTR)(id) >= -1)) #define IS_STRING_ITEM(flags) (MF_STRING == MENU_ITEM_TYPE(flags)) diff --git a/win32ss/user/user32/windows/menu.c b/win32ss/user/user32/windows/menu.c index 59c687f4c3a..0d20c780981 100644 --- a/win32ss/user/user32/windows/menu.c +++ b/win32ss/user/user32/windows/menu.c @@ -42,14 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(menu); #define IS_STRING_ITEM(flags) (MF_STRING == MENU_ITEM_TYPE(flags)) #define IS_MAGIC_BITMAP(id) ((id) && ((INT_PTR)(id) < 12) && ((INT_PTR)(id) >= -1)) -#define IS_SYSTEM_MENU(MenuInfo) \ - (0 == ((MenuInfo)->fFlags & MNF_POPUP) && 0 != ((MenuInfo)->fFlags & MNF_SYSMENU)) - -#define IS_SYSTEM_POPUP(MenuInfo) \ - (0 != ((MenuInfo)->fFlags & MNF_POPUP) && 0 != ((MenuInfo)->fFlags & MNF_SYSMENU)) - -#define IS_BITMAP_ITEM(flags) (MF_BITMAP == MENU_ITEM_TYPE(flags)) - /********************************************************************* * PopupMenu class descriptor */

1 year, 5 months

[reactos] 01/01: [APPWIZ] Don't forget to CoInitializeEx on COM thread (#5551)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e6b3f4bbd4ca9a812465… commit 9e6b3f4bbd4ca9a8124650a55a4690fdf8851fe2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 14 21:06:40 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 14 21:06:40 2023 +0900 [APPWIZ] Don't forget to CoInitializeEx on COM thread (#5551) - Do CoInitializeEx and CoUninitialize in download_proc. CORE-19110, CORE-15786 --- dll/cpl/appwiz/addons.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dll/cpl/appwiz/addons.c b/dll/cpl/appwiz/addons.c index 5fdfc999f1e..614bd2ab3e8 100644 --- a/dll/cpl/appwiz/addons.c +++ b/dll/cpl/appwiz/addons.c @@ -358,7 +358,9 @@ static DWORD WINAPI download_proc(PVOID arg) { WCHAR message[256]; WCHAR tmp_dir[MAX_PATH], tmp_file[MAX_PATH]; - HRESULT hres; + HRESULT hres, hrCoInit; + + hrCoInit = CoInitializeEx(NULL, COINIT_MULTITHREADED); GetTempPathW(sizeof(tmp_dir)/sizeof(WCHAR), tmp_dir); GetTempFileNameW(tmp_dir, NULL, 0, tmp_file); @@ -388,6 +390,10 @@ static DWORD WINAPI download_proc(PVOID arg) DeleteFileW(tmp_file); PostMessageW(install_dialog, WM_COMMAND, IDCANCEL, 0); + + if (SUCCEEDED(hrCoInit)) + CoUninitialize(); + return 0; }

1 year, 5 months

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