Ros-diffs March 2018

ros-diffs@reactos.org

25 participants
436 discussions

01/01: [NTOS:MM] Improve debug prints in MmCreateVirtualMappingUnsafe. CORE-14478

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a17bf6f669c974162b74f… commit a17bf6f669c974162b74f2f3ca18cc9cc5c2cb65 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Mar 18 23:49:42 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Mar 18 23:49:48 2018 +0100 [NTOS:MM] Improve debug prints in MmCreateVirtualMappingUnsafe. CORE-14478 --- ntoskrnl/mm/i386/page.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index 1bc842deeb..e09f121278 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -673,13 +673,13 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, { if (Address < MmSystemRangeStart) { - DPRINT1("No process\n"); + DPRINT1("NULL process given for user-mode mapping at %p -- %lu pages starting at %Ix\n", Address, PageCount, *Pages); KeBugCheck(MEMORY_MANAGEMENT); } if (PageCount > 0x10000 || (ULONG_PTR) Address / PAGE_SIZE + PageCount > 0x100000) { - DPRINT1("Page count too large\n"); + DPRINT1("Page count too large for kernel-mode mapping at %p -- %lu pages starting at %Ix\n", Address, PageCount, *Pages); KeBugCheck(MEMORY_MANAGEMENT); } } @@ -687,14 +687,14 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, { if (Address >= MmSystemRangeStart) { - DPRINT1("Setting kernel address with process context\n"); + DPRINT1("Process %p given for kernel-mode mapping at %p -- %lu pages starting at %Ix\n", Process, Address, PageCount, *Pages); KeBugCheck(MEMORY_MANAGEMENT); } if (PageCount > (ULONG_PTR)MmSystemRangeStart / PAGE_SIZE || (ULONG_PTR) Address / PAGE_SIZE + PageCount > (ULONG_PTR)MmSystemRangeStart / PAGE_SIZE) { - DPRINT1("Page Count too large\n"); + DPRINT1("Page count too large for process %p user-mode mapping at %p -- %lu pages starting at %Ix\n", Process, Address, PageCount, *Pages); KeBugCheck(MEMORY_MANAGEMENT); } }

6 years, 9 months

01/01: [NTOSKNRL] Always reference a newly created VACB

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e579843bcf2f54da8e71… commit 1e579843bcf2f54da8e717ec9713b86e9ad1c02c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Mar 18 18:14:17 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Mar 18 18:16:55 2018 +0100 [NTOSKNRL] Always reference a newly created VACB This allows being consistent between newly created and looked up so that VACB can always safely be released. Should really help with reference issues. CORE-14481 CORE-14480 CORE-14482 --- ntoskrnl/cc/view.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 6a295504c3..e896c57093 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -808,6 +808,9 @@ CcRosCreateVacb ( ExFreeToNPagedLookasideList(&VacbLookasideList, current); } + /* Reference it to allow release */ + CcRosVacbIncRefCount(current); + return Status; } @@ -842,8 +845,6 @@ CcRosGetVacb ( { return Status; } - - CcRosVacbIncRefCount(current); } KeAcquireGuardedMutex(&ViewLock);

6 years, 9 months

01/01: [OLEPRO32] Add missing stdole2 dependency.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=342c404c0012e57598da7… commit 342c404c0012e57598da72e113bf2abf7fc06551 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Mar 18 17:19:37 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Mar 18 17:19:37 2018 +0100 [OLEPRO32] Add missing stdole2 dependency. --- dll/win32/olepro32/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/olepro32/CMakeLists.txt b/dll/win32/olepro32/CMakeLists.txt index 2b7c05c70f..c4a172e0b3 100644 --- a/dll/win32/olepro32/CMakeLists.txt +++ b/dll/win32/olepro32/CMakeLists.txt @@ -15,6 +15,7 @@ list(APPEND olepro32_rc_deps set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS "${olepro32_rc_deps}") add_library(olepro32 SHARED ${SOURCE} version.rc) +add_dependencies(olepro32 stdole2) set_module_type(olepro32 win32dll) target_link_libraries(olepro32 wine) add_importlibs(olepro32 oleaut32 msvcrt kernel32 ntdll)

6 years, 9 months

01/01: [BOOTLIB] Fix 64 bit issues (#433)

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3be40816079f3b3f2ff3b… commit 3be40816079f3b3f2ff3bafde7c237336f0c461e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Mar 18 16:10:41 2018 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 18 16:10:41 2018 +0100 [BOOTLIB] Fix 64 bit issues (#433) --- boot/environ/app/bootmgr/bootmgr.c | 24 +++++++++++----------- boot/environ/app/rosload/roslogo.c | 2 +- boot/environ/include/bl.h | 10 +++++++++- boot/environ/lib/arch/stub/arch.c | 13 ++++++++++++ boot/environ/lib/firmware/efi/firmware.c | 34 ++++++++++++++++---------------- boot/environ/lib/io/device.c | 2 +- boot/environ/lib/io/display/display.c | 8 ++++---- boot/environ/lib/io/etfs.c | 3 ++- boot/environ/lib/io/file.c | 4 ++-- boot/environ/lib/misc/bcd.c | 2 +- boot/environ/lib/misc/bootreg.c | 2 +- boot/environ/lib/misc/font.c | 2 +- boot/environ/lib/misc/image.c | 16 +++++++-------- boot/environ/lib/misc/rtlcompat.c | 4 ++++ boot/environ/lib/misc/util.c | 3 ++- boot/environ/lib/mm/blkalloc.c | 4 ++-- boot/environ/lib/mm/heapalloc.c | 6 +++--- boot/environ/lib/mm/pagealloc.c | 4 ++-- 18 files changed, 85 insertions(+), 58 deletions(-) diff --git a/boot/environ/app/bootmgr/bootmgr.c b/boot/environ/app/bootmgr/bootmgr.c index 85d501b310..458e1437f8 100644 --- a/boot/environ/app/bootmgr/bootmgr.c +++ b/boot/environ/app/bootmgr/bootmgr.c @@ -231,7 +231,7 @@ BmpFwGetApplicationDirectoryPath ( ) { NTSTATUS Status; - ULONG i, AppPathLength; + SIZE_T i, AppPathLength; PWCHAR ApplicationPath, PathCopy; /* Clear the incoming string */ @@ -257,11 +257,11 @@ BmpFwGetApplicationDirectoryPath ( } /* Check if we have space for one more character */ - Status = RtlULongAdd(i, 1, &AppPathLength); + Status = RtlSIZETAdd(i, 1, &AppPathLength); if (NT_SUCCESS(Status)) { /* Check if it's safe to multiply by two */ - Status = RtlULongMult(AppPathLength, sizeof(WCHAR), &AppPathLength); + Status = RtlSIZETMult(AppPathLength, sizeof(WCHAR), &AppPathLength); if (NT_SUCCESS(Status)) { /* Allocate a copy for the string */ @@ -647,11 +647,11 @@ BmpFwGetFullPath ( ) { NTSTATUS Status; - ULONG BootDirLength, PathLength; + SIZE_T BootDirLength, PathLength; /* Compute the length of the directory, and add a NUL */ BootDirLength = wcslen(BootDirectory); - Status = RtlULongAdd(BootDirLength, 1, &BootDirLength); + Status = RtlSIZETAdd(BootDirLength, 1, &BootDirLength); if (!NT_SUCCESS(Status)) { goto Quickie; @@ -659,14 +659,14 @@ BmpFwGetFullPath ( /* Add the length of the file, make sure it fits */ PathLength = wcslen(FileName); - Status = RtlULongAdd(PathLength, BootDirLength, &PathLength); + Status = RtlSIZETAdd(PathLength, BootDirLength, &PathLength); if (!NT_SUCCESS(Status)) { goto Quickie; } /* Convert to bytes */ - Status = RtlULongLongToULong(PathLength * sizeof(WCHAR), &PathLength); + Status = RtlSIZETMult(PathLength, sizeof(WCHAR), &PathLength); if (!NT_SUCCESS(Status)) { goto Quickie; @@ -716,7 +716,7 @@ BmOpenDataStore ( PBL_DEVICE_DESCRIPTOR BcdDevice; PWCHAR BcdPath, FullPath, PathBuffer; BOOLEAN HavePath; - ULONG PathLength, FullSize; + SIZE_T PathLength, FullSize; PVOID FinalBuffer; UNICODE_STRING BcdString; @@ -795,21 +795,21 @@ BmOpenDataStore ( /* Add a NUL to the path, make sure it'll fit */ PathLength = wcslen(PathBuffer); - Status = RtlULongAdd(PathLength, 1, &PathLength); + Status = RtlSIZETAdd(PathLength, 1, &PathLength); if (!NT_SUCCESS(Status)) { goto Quickie; } /* Convert to bytes */ - Status = RtlULongLongToULong(PathLength * sizeof(WCHAR), &PathLength); + Status = RtlSIZETMult(PathLength, sizeof(WCHAR), &PathLength); if (!NT_SUCCESS(Status)) { goto Quickie; } /* Now add the size of the path to the device path, check if it fits */ - Status = RtlULongAdd(PathLength, BcdDevice->Size, &FullSize); + Status = RtlSIZETAdd(PathLength, BcdDevice->Size, &FullSize); if (!NT_SUCCESS(Status)) { goto Quickie; @@ -2158,7 +2158,7 @@ BmDisplayDumpError ( if (BmpInternalBootError) { /* Return it -- but it's a pointer? */ - return (ULONG)BmpInternalBootError; // ??? + return (ULONG_PTR)BmpInternalBootError; // ??? } /* Otherwise, show the menu to see what to do */ diff --git a/boot/environ/app/rosload/roslogo.c b/boot/environ/app/rosload/roslogo.c index 3cf4a87a91..eb432eb2f0 100644 --- a/boot/environ/app/rosload/roslogo.c +++ b/boot/environ/app/rosload/roslogo.c @@ -9785,7 +9785,7 @@ OslDrawLogo ( CoordinateX = (DspGraphicalConsole->DisplayMode.HRes / 2) - (BmpWidth / 2); CoordinateY = (DspGraphicalConsole->DisplayMode.VRes / 2) - (BmpHeight / 2); BlMmTranslateVirtualAddress(GopBlt, &GopBltPhys); - GopBlt = (PVOID)GopBltPhys.LowPart; + GopBlt = PhysicalAddressToPtr(GopBltPhys); /* Make the screen black */ RtlFillMemory(DspGraphicalConsole->FrameBuffer, diff --git a/boot/environ/include/bl.h b/boot/environ/include/bl.h index 82edfbcb00..bea6856f05 100644 --- a/boot/environ/include/bl.h +++ b/boot/environ/include/bl.h @@ -1385,6 +1385,14 @@ MmMdInitializeListHead ( List->Type = 0; } +FORCEINLINE +PVOID +PhysicalAddressToPtr ( + _In_ PHYSICAL_ADDRESS PhysicalAddress) +{ + return (PVOID)(ULONG_PTR)PhysicalAddress.QuadPart; +} + /* INITIALIZATION ROUTINES ***************************************************/ NTSTATUS @@ -2369,7 +2377,7 @@ BlpMmCreateBlockAllocator ( PVOID BlMmAllocateHeap ( - _In_ ULONG Size + _In_ SIZE_T Size ); NTSTATUS diff --git a/boot/environ/lib/arch/stub/arch.c b/boot/environ/lib/arch/stub/arch.c index be6685edab..31c96e7994 100644 --- a/boot/environ/lib/arch/stub/arch.c +++ b/boot/environ/lib/arch/stub/arch.c @@ -13,6 +13,9 @@ /* DATA VARIABLES ************************************************************/ PBL_ARCH_CONTEXT CurrentExecutionContext; +PBL_MM_RELOCATE_SELF_MAP BlMmRelocateSelfMap; +PBL_MM_MOVE_VIRTUAL_ADDRESS_RANGE BlMmMoveVirtualAddressRange; +PBL_MM_ZERO_VIRTUAL_ADDRESS_RANGE BlMmZeroVirtualAddressRange; /* FUNCTIONS *****************************************************************/ @@ -50,3 +53,13 @@ Archx86TransferTo32BitApplicationAsm (VOID) EfiPrintf(L" Archx86TransferTo32BitApplicationAsm NOT IMPLEMENTED for this platform\r\n"); } +NTSTATUS +OslArchTransferToKernel( + _In_ struct _LOADER_PARAMETER_BLOCK *LoaderBlock, + _In_ PVOID KernelEntrypoint + ) +{ + EfiPrintf(L" OslArchTransferToKernel NOT IMPLEMENTED for this platform\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + diff --git a/boot/environ/lib/firmware/efi/firmware.c b/boot/environ/lib/firmware/efi/firmware.c index 915de6d43e..6c9edb24ca 100644 --- a/boot/environ/lib/firmware/efi/firmware.c +++ b/boot/environ/lib/firmware/efi/firmware.c @@ -280,7 +280,7 @@ EfiVmOpenProtocol ( } /* Check what address the interface lives at, and translate it */ - InterfaceVa = (PVOID)InterfaceAddress.LowPart; + InterfaceVa = PhysicalAddressToPtr(InterfaceAddress); if (BlMmTranslateVirtualAddress(InterfaceVa, &TranslatedAddress)) { /* We expect firmware to be 1:1 mapped, fail if not */ @@ -868,9 +868,9 @@ EfiConInExSetState ( { /* Translate pointers from virtual to physical */ BlMmTranslateVirtualAddress(ConInEx, &ConInExPhys); - ConInEx = (EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL*)ConInExPhys.LowPart; + ConInEx = (EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL*)PhysicalAddressToPtr(ConInExPhys); BlMmTranslateVirtualAddress(KeyToggleState, &KeyTogglePhys); - KeyToggleState = (EFI_KEY_TOGGLE_STATE*)KeyTogglePhys.LowPart; + KeyToggleState = (EFI_KEY_TOGGLE_STATE*)PhysicalAddressToPtr(KeyTogglePhys); /* Switch to real mode */ BlpArchSwitchContext(BlRealMode); @@ -938,15 +938,15 @@ EfiGetMemoryMap ( { /* Convert all of the addresses to physical */ BlMmTranslateVirtualAddress(MemoryMapSize, &MemoryMapSizePhysical); - MemoryMapSize = (UINTN*)MemoryMapSizePhysical.LowPart; + MemoryMapSize = (UINTN*)PhysicalAddressToPtr(MemoryMapSizePhysical); BlMmTranslateVirtualAddress(MemoryMap, &MemoryMapPhysical); - MemoryMap = (EFI_MEMORY_DESCRIPTOR*)MemoryMapPhysical.LowPart; + MemoryMap = (EFI_MEMORY_DESCRIPTOR*)PhysicalAddressToPtr(MemoryMapPhysical); BlMmTranslateVirtualAddress(MapKey, &MapKeyPhysical); - MapKey = (UINTN*)MapKeyPhysical.LowPart; + MapKey = (UINTN*)PhysicalAddressToPtr(MapKeyPhysical); BlMmTranslateVirtualAddress(DescriptorSize, &DescriptorSizePhysical); - DescriptorSize = (UINTN*)DescriptorSizePhysical.LowPart; + DescriptorSize = (UINTN*)PhysicalAddressToPtr(DescriptorSizePhysical); BlMmTranslateVirtualAddress(DescriptorVersion, &DescriptorVersionPhysical); - DescriptorVersion = (UINTN*)DescriptorVersionPhysical.LowPart; + DescriptorVersion = (UINTN*)PhysicalAddressToPtr(DescriptorVersionPhysical); /* Switch to real mode */ BlpArchSwitchContext(BlRealMode); @@ -1267,15 +1267,15 @@ EfiGopGetFrameBuffer ( { /* Translate pointer to physical */ BlMmTranslateVirtualAddress(GopInterface, &GopInterfacePhys); - GopInterface = (PVOID)GopInterfacePhys.LowPart; + GopInterface = PhysicalAddressToPtr(GopInterfacePhys); /* Translate pointer to physical */ BlMmTranslateVirtualAddress(FrameBuffer, &FrameBufferPhys); - FrameBuffer = (PVOID)FrameBufferPhys.LowPart; + FrameBuffer = PhysicalAddressToPtr(FrameBufferPhys); /* Translate pointer to physical */ BlMmTranslateVirtualAddress(FrameBufferSize, &FrameBufferSizePhys); - FrameBufferSize = (PVOID)FrameBufferSizePhys.LowPart; + FrameBufferSize = PhysicalAddressToPtr(FrameBufferSizePhys); /* Switch to real mode */ BlpArchSwitchContext(BlRealMode); @@ -1311,21 +1311,21 @@ EfiGopGetCurrentMode ( { return STATUS_UNSUCCESSFUL; } - GopInterface = (PVOID)GopInterfacePhys.LowPart; + GopInterface = PhysicalAddressToPtr(GopInterfacePhys); /* Translate pointer to physical */ if (!BlMmTranslateVirtualAddress(Mode, &ModePhys)) { return STATUS_UNSUCCESSFUL; } - Mode = (PVOID)ModePhys.LowPart; + Mode = PhysicalAddressToPtr(ModePhys); /* Translate pointer to physical */ if (!BlMmTranslateVirtualAddress(Information, &InformationPhys)) { return STATUS_UNSUCCESSFUL; } - Information = (PVOID)InformationPhys.LowPart; + Information = PhysicalAddressToPtr(InformationPhys); /* Switch to real mode */ BlpArchSwitchContext(BlRealMode); @@ -1435,7 +1435,7 @@ EfiLocateHandleBuffer ( { /* Translate the input buffer from virtual to physical */ TranslateResult = BlMmTranslateVirtualAddress(InputBuffer, &BufferPhys); - InputBuffer = TranslateResult ? (PVOID)BufferPhys.LowPart : NULL; + InputBuffer = TranslateResult ? PhysicalAddressToPtr(BufferPhys) : NULL; /* Switch to real mode */ BlpArchSwitchContext(BlRealMode); @@ -1478,7 +1478,7 @@ EfiLocateHandleBuffer ( /* Translate the input buffer from virtual to physical */ TranslateResult = BlMmTranslateVirtualAddress(InputBuffer, &BufferPhys); - InputBuffer = TranslateResult ? (PVOID)BufferPhys.LowPart : NULL; + InputBuffer = TranslateResult ? PhysicalAddressToPtr(BufferPhys) : NULL; /* Switch to real mode */ BlpArchSwitchContext(BlRealMode); @@ -1581,7 +1581,7 @@ EfiAllocatePages ( { /* Translate output address */ BlMmTranslateVirtualAddress(Memory, &MemoryPhysical); - Memory = (EFI_PHYSICAL_ADDRESS*)MemoryPhysical.LowPart; + Memory = (EFI_PHYSICAL_ADDRESS*)PhysicalAddressToPtr(MemoryPhysical); /* Switch to real mode */ BlpArchSwitchContext(BlRealMode); diff --git a/boot/environ/lib/io/device.c b/boot/environ/lib/io/device.c index b4fd38e178..48606b5258 100644 --- a/boot/environ/lib/io/device.c +++ b/boot/environ/lib/io/device.c @@ -1835,7 +1835,7 @@ BlockIoEfiHashFunction ( ) { /* Get rid of the alignment bits to have a more unique number */ - return ((ULONG)Entry->Value >> 3) % TableSize; + return ((ULONG_PTR)Entry->Value >> 3) % TableSize; } NTSTATUS diff --git a/boot/environ/lib/io/display/display.c b/boot/environ/lib/io/display/display.c index 8d7631f37b..6c186df37a 100644 --- a/boot/environ/lib/io/display/display.c +++ b/boot/environ/lib/io/display/display.c @@ -61,7 +61,7 @@ DsppLoadFontFile ( { PBL_DEVICE_DESCRIPTOR FontDevice; NTSTATUS Status; - ULONG NameLength, DirectoryLength, TotalLength; + SIZE_T NameLength, DirectoryLength, TotalLength; PWCHAR FontPath, FontDirectory; BL_LIBRARY_PARAMETERS LibraryParameters; BOOLEAN CustomDirectory, CustomDevice; @@ -114,21 +114,21 @@ DsppLoadFontFile ( DirectoryLength = wcslen(FontDirectory); /* Safely add them up*/ - Status = RtlULongAdd(NameLength, DirectoryLength, &TotalLength); + Status = RtlSIZETAdd(NameLength, DirectoryLength, &TotalLength); if (!NT_SUCCESS(Status)) { goto Quickie; } /* Convert to bytes */ - Status = RtlULongLongToULong(TotalLength * sizeof(WCHAR), &TotalLength); + Status = RtlSIZETMult(TotalLength, sizeof(WCHAR), &TotalLength); if (!NT_SUCCESS(Status)) { goto Quickie; } /* Add a terminating NUL */ - Status = RtlULongAdd(TotalLength, sizeof(UNICODE_NULL), &TotalLength); + Status = RtlSIZETAdd(TotalLength, sizeof(UNICODE_NULL), &TotalLength); if (!NT_SUCCESS(Status)) { goto Quickie; diff --git a/boot/environ/lib/io/etfs.c b/boot/environ/lib/io/etfs.c index ffb4553f9a..8d8797b01b 100644 --- a/boot/environ/lib/io/etfs.c +++ b/boot/environ/lib/io/etfs.c @@ -547,7 +547,8 @@ EtfsOpen ( PBL_FILE_ENTRY NewFile; PWCHAR FilePath, FormatString; PBL_ETFS_FILE EtfsFile; - ULONG DeviceId, FileSize, DirOffset, FileOffset, Size; + ULONG DeviceId, FileSize, DirOffset, FileOffset; + SIZE_T Size; PRAW_DIR_REC DirEntry; BOOLEAN IsDirectory; diff --git a/boot/environ/lib/io/file.c b/boot/environ/lib/io/file.c index a3f4b6e581..6d8c657da2 100644 --- a/boot/environ/lib/io/file.c +++ b/boot/environ/lib/io/file.c @@ -41,7 +41,7 @@ FileIoCopyParentDirectoryPath ( _In_ PWCHAR FilePath ) { - ULONG PathSize, PathSizeWithNull; + SIZE_T PathSize, PathSizeWithNull; PWCHAR Backslash, ParentCopy; PathSize = wcslen(FilePath) * sizeof(WCHAR); @@ -81,7 +81,7 @@ FileIoCopyFileName ( ) { PWCHAR Separator, FileCopy; - ULONG PathSize; + SIZE_T PathSize; Separator = wcsrchr(FilePath, '\\'); if (!Separator) diff --git a/boot/environ/lib/misc/bcd.c b/boot/environ/lib/misc/bcd.c index 26cdd4f324..b3ae2b5375 100644 --- a/boot/environ/lib/misc/bcd.c +++ b/boot/environ/lib/misc/bcd.c @@ -59,7 +59,7 @@ BiConvertRegistryDataToElement ( ) { NTSTATUS Status; - ULONG Length, Size, ReturnedLength; + SIZE_T Length, Size, ReturnedLength; PBL_DEVICE_DESCRIPTOR Device; BOOLEAN NullTerminate; PBCD_DEVICE_OPTION BcdDevice, ElementDevice; diff --git a/boot/environ/lib/misc/bootreg.c b/boot/environ/lib/misc/bootreg.c index 88b970dbac..bf66657230 100644 --- a/boot/environ/lib/misc/bootreg.c +++ b/boot/environ/lib/misc/bootreg.c @@ -192,7 +192,7 @@ BiOpenKey( PBI_KEY_OBJECT ParentKey, NewKey; PBI_KEY_HIVE ParentHive; NTSTATUS Status; - ULONG NameLength, SubNameLength, NameBytes; + SIZE_T NameLength, SubNameLength, NameBytes; PWCHAR NameStart, NameBuffer; UNICODE_STRING KeyString; HCELL_INDEX KeyCell; diff --git a/boot/environ/lib/misc/font.c b/boot/environ/lib/misc/font.c index e271d286f1..ede267d3c0 100644 --- a/boot/environ/lib/misc/font.c +++ b/boot/environ/lib/misc/font.c @@ -54,7 +54,7 @@ BfLoadFontFile ( ) { PBL_DEFERRED_FONT_FILE DeferredFont; - ULONG FontPathSize; + SIZE_T FontPathSize; /* Allocate the deferred font structure */ DeferredFont = (PBL_DEFERRED_FONT_FILE)BlMmAllocateHeap(sizeof(*DeferredFont)); diff --git a/boot/environ/lib/misc/image.c b/boot/environ/lib/misc/image.c index 29fdb9def9..9e682f4288 100644 --- a/boot/environ/lib/misc/image.c +++ b/boot/environ/lib/misc/image.c @@ -304,7 +304,7 @@ BlImgAllocateImageBuffer ( } /* Now map the physical buffer at the address requested */ - MappedBase = (PVOID)PhysicalAddress.LowPart; + MappedBase = PhysicalAddressToPtr(PhysicalAddress); Status = BlMmMapPhysicalAddressEx(&MappedBase, BlMemoryFixed, Size, @@ -976,9 +976,9 @@ ImgpLoadPEImage ( } /* Make sure that the section doesn't overflow in memory */ - Status = RtlULongAdd(Section->VirtualAddress, - SectionSize, - &SectionEnd); + Status = RtlULongPtrAdd(Section->VirtualAddress, + SectionSize, + &SectionEnd); if (!NT_SUCCESS(Status)) { EfiPrintf(L"fail 21\r\n"); @@ -994,9 +994,9 @@ ImgpLoadPEImage ( } /* Make sure it doesn't overflow on disk */ - Status = RtlULongAdd(Section->VirtualAddress, - AlignSize, - &SectionEnd); + Status = RtlULongPtrAdd(Section->VirtualAddress, + AlignSize, + &SectionEnd); if (!NT_SUCCESS(Status)) { EfiPrintf(L"fail 31\r\n"); @@ -1848,7 +1848,7 @@ ImgArchEfiStartBootApplication ( __sidt(&Idt.Limit); /* Allocate space for the IDT, GDT, and 24 pages of stack */ - BootSizeNeeded = (ULONG)PAGE_ALIGN(Idt.Limit + Gdt.Limit + 1 + 25 * PAGE_SIZE); + BootSizeNeeded = (ULONG_PTR)PAGE_ALIGN(Idt.Limit + Gdt.Limit + 1 + 25 * PAGE_SIZE); Status = MmPapAllocatePagesInRange(&BootData, BlLoaderArchData, BootSizeNeeded >> PAGE_SHIFT, diff --git a/boot/environ/lib/misc/rtlcompat.c b/boot/environ/lib/misc/rtlcompat.c index 0a0e1d55bc..06ebf7e35d 100644 --- a/boot/environ/lib/misc/rtlcompat.c +++ b/boot/environ/lib/misc/rtlcompat.c @@ -23,7 +23,11 @@ CHECK_PAGED_CODE_RTL ( } #endif +#ifdef _WIN64 +PVOID MmHighestUserAddress = (PVOID)0xFFFFFFFFULL; // CHECKME +#else PVOID MmHighestUserAddress = (PVOID)0xFFFFFFFF; +#endif PVOID NTAPI diff --git a/boot/environ/lib/misc/util.c b/boot/environ/lib/misc/util.c index 18f21cc2e9..20a01881dc 100644 --- a/boot/environ/lib/misc/util.c +++ b/boot/environ/lib/misc/util.c @@ -960,6 +960,7 @@ BlArchGetCpuVendor ( { return CPU_VIA; } +#ifdef _M_IX86 if (!strncmp((PCHAR)&CpuInfo.Ebx, "CyrixInstead", 12)) { return CPU_CYRIX; @@ -972,7 +973,7 @@ BlArchGetCpuVendor ( { return CPU_RISE; } - +#endif // _M_IX86 /* Other */ return CPU_UNKNOWN; } diff --git a/boot/environ/lib/mm/blkalloc.c b/boot/environ/lib/mm/blkalloc.c index 3133f1a8a3..53dae681dd 100644 --- a/boot/environ/lib/mm/blkalloc.c +++ b/boot/environ/lib/mm/blkalloc.c @@ -48,7 +48,7 @@ MmBapCompareBlockAllocatorTableEntry ( ) { PBL_BLOCK_DESCRIPTOR BlockInfo = (PBL_BLOCK_DESCRIPTOR)Entry; - ULONG BlockId = (ULONG)Argument1; + ULONG BlockId = PtrToUlong(Argument1); /* Check if the block ID matches */ return BlockInfo->BlockId == BlockId; @@ -67,7 +67,7 @@ MmBapFindBlockInformation ( MmBlockAllocatorTableEntries, &EntryId, MmBapCompareBlockAllocatorTableEntry, - (PVOID)EntryId, + UlongToPtr(EntryId), NULL, NULL, NULL); diff --git a/boot/environ/lib/mm/heapalloc.c b/boot/environ/lib/mm/heapalloc.c index 5b65399638..973417fc53 100644 --- a/boot/environ/lib/mm/heapalloc.c +++ b/boot/environ/lib/mm/heapalloc.c @@ -567,7 +567,7 @@ MmHaInitialize ( PVOID BlMmAllocateHeap ( - _In_ ULONG Size + _In_ SIZE_T Size ) { ULONG BufferSize; @@ -581,8 +581,8 @@ BlMmAllocateHeap ( } /* Align the buffer size to the minimum size required */ - BufferSize = ALIGN_UP(Size + FIELD_OFFSET(BL_BUSY_HEAP_ENTRY, Buffer), - FIELD_OFFSET(BL_BUSY_HEAP_ENTRY, Buffer)); + BufferSize = ALIGN_UP_BY(Size + FIELD_OFFSET(BL_BUSY_HEAP_ENTRY, Buffer), + FIELD_OFFSET(BL_BUSY_HEAP_ENTRY, Buffer)); /* Watch out for overflow */ if (BufferSize <= Size) diff --git a/boot/environ/lib/mm/pagealloc.c b/boot/environ/lib/mm/pagealloc.c index fc42077ce5..4642552f88 100644 --- a/boot/environ/lib/mm/pagealloc.c +++ b/boot/environ/lib/mm/pagealloc.c @@ -865,7 +865,7 @@ MmPapAllocatePagesInRange ( Type); /* Return the allocated address */ - *PhysicalAddress = (PVOID)BaseAddress.LowPart; + *PhysicalAddress = PhysicalAddressToPtr(BaseAddress); } Exit: @@ -1639,7 +1639,7 @@ MmSelectMappingAddress ( if (MmTranslationType == BlNone) { /* Just return the physical address as the mapping address */ - PreferredAddress = (PVOID)PhysicalAddress.LowPart; + PreferredAddress = PhysicalAddressToPtr(PhysicalAddress); goto Success; }

6 years, 9 months

02/02: [APPHELP_APITEST] Fix some 64 bit issues.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8bbbab534afbd501b27f7… commit 8bbbab534afbd501b27f706755914aa0405e1527 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Mar 18 15:57:46 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 18 15:58:04 2018 +0100 [APPHELP_APITEST] Fix some 64 bit issues. --- modules/rostests/apitests/apphelp/apphelp.c | 4 ++-- modules/rostests/apitests/apphelp/data.c | 7 ++++--- modules/rostests/apitests/apphelp/db.cpp | 11 +++++------ modules/rostests/apitests/apphelp/layerapi.c | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/rostests/apitests/apphelp/apphelp.c b/modules/rostests/apitests/apphelp/apphelp.c index 4a300e3e5a..6b09f1102f 100644 --- a/modules/rostests/apitests/apphelp/apphelp.c +++ b/modules/rostests/apitests/apphelp/apphelp.c @@ -4,7 +4,7 @@ * PURPOSE: Misc apphelp tests * COPYRIGHT: Copyright 2012 Detlef Riekenberg * Copyright 2013 Mislav Blažević - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #include <ntstatus.h> @@ -606,7 +606,7 @@ static void test_crc_imp(size_t len, DWORD expected) pSdbFreeFileAttributes(pattrinfo); } -static void test_crc2_imp(size_t len, int fill, DWORD expected) +static void test_crc2_imp(DWORD len, int fill, DWORD expected) { static const WCHAR path[] = {'t','e','s','t','x','x','.','e','x','e',0}; diff --git a/modules/rostests/apitests/apphelp/data.c b/modules/rostests/apitests/apphelp/data.c index f7ef6cd764..95dd921619 100644 --- a/modules/rostests/apitests/apphelp/data.c +++ b/modules/rostests/apitests/apphelp/data.c @@ -2,7 +2,7 @@ * PROJECT: apphelp_apitest * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Common data / functions for apphelp_apitest - * COPYRIGHT: Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #include <exdisp.h> @@ -231,6 +231,7 @@ typedef struct rsrc_section_t VAR translation; } rsrc_section_t; +#define RT_VERSION_DW 16 static const rsrc_section_t rsrc_section = { /* header */ @@ -245,7 +246,7 @@ static const rsrc_section_t rsrc_section = /* file_info_id */ { {{ - (DWORD)VS_FILE_INFO, /* NameOffset:31 */ + RT_VERSION_DW, /* NameOffset:31 */ 0 /* NameIsString:1 */ }}, { @@ -552,7 +553,7 @@ void test_create_file_imp(const WCHAR* name, const char* contents, size_t len) if (contents && len) { DWORD size; - WriteFile(file, contents, len, &size, NULL); + WriteFile(file, contents, (DWORD)len, &size, NULL); } CloseHandle(file); } diff --git a/modules/rostests/apitests/apphelp/db.cpp b/modules/rostests/apitests/apphelp/db.cpp index c01d54be17..3d6480a6f1 100644 --- a/modules/rostests/apitests/apphelp/db.cpp +++ b/modules/rostests/apitests/apphelp/db.cpp @@ -4,7 +4,7 @@ * PURPOSE: Tests for shim-database api's * COPYRIGHT: Copyright 2012 Detlef Riekenberg * Copyright 2013 Mislav Blažević - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #include <ntstatus.h> @@ -471,7 +471,7 @@ static void test_stringtable() static const WCHAR* all[] = { test1, test2, test3, test4, test5, lipsum, lipsum2, empty }; static const TAGID expected_str[] = { 0xc, 0x12, 0x18, 0x1e, 0x24, 0x2a, 0x30, 0x36 }; static const TAGID expected_tab[] = { 6, 0x18, 0x2a, 0x3c, 0x4e, 0x60, 0x846, 0x102c }; - size_t n, j; + DWORD n, j; for (n = 0; n < (sizeof(all) / sizeof(all[0])); ++n) { @@ -1079,9 +1079,8 @@ static BOOL IsUserAdmin() } - template<typename SDBQUERYRESULT_T> -static void check_adwExeFlags(DWORD adwExeFlags_0, SDBQUERYRESULT_T& query, const char* file, int line, int cur) +static void check_adwExeFlags(DWORD adwExeFlags_0, SDBQUERYRESULT_T& query, const char* file, int line, size_t cur) { ok_(file, line)(query.adwExeFlags[0] == adwExeFlags_0, "Expected adwExeFlags[0] to be 0x%x, was: 0x%x for %d\n", adwExeFlags_0, query.adwExeFlags[0], cur); for (size_t n = 1; n < _countof(query.atrExes); ++n) @@ -1089,13 +1088,13 @@ static void check_adwExeFlags(DWORD adwExeFlags_0, SDBQUERYRESULT_T& query, cons } template<> -void check_adwExeFlags(DWORD, SDBQUERYRESULT_2k3&, const char*, int, int) +void check_adwExeFlags(DWORD, SDBQUERYRESULT_2k3&, const char*, int, size_t) { } template<typename SDBQUERYRESULT_T> -static void test_mode_generic(const WCHAR* workdir, HSDB hsdb, int cur) +static void test_mode_generic(const WCHAR* workdir, HSDB hsdb, size_t cur) { WCHAR exename[MAX_PATH], testfile[MAX_PATH]; BOOL ret; diff --git a/modules/rostests/apitests/apphelp/layerapi.c b/modules/rostests/apitests/apphelp/layerapi.c index 7be1903069..fd44398940 100644 --- a/modules/rostests/apitests/apphelp/layerapi.c +++ b/modules/rostests/apitests/apphelp/layerapi.c @@ -2,7 +2,7 @@ * PROJECT: apphelp_apitest * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for (registry)layer manipulation api's - * COPYRIGHT: Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #include <ntstatus.h> @@ -57,7 +57,7 @@ static BOOL setLayerValue(BOOL bMachine, const char* valueName, const char* valu if (lstatus == ERROR_SUCCESS) { if (value) - lstatus = RegSetValueExA(key, valueName, 0, REG_SZ, (const BYTE*)value, strlen(value)+1); + lstatus = RegSetValueExA(key, valueName, 0, REG_SZ, (const BYTE*)value, (DWORD)strlen(value)+1); else { lstatus = RegDeleteValueA(key, valueName); @@ -564,7 +564,7 @@ static void test_SetPermLayer(void) ok(DeleteFileA(file), "DeleteFile failed....\n"); } -static BOOL create_file(LPCSTR dir, LPCSTR name, int filler, size_t size) +static BOOL create_file(LPCSTR dir, LPCSTR name, int filler, DWORD size) { char target[MAX_PATH], *tmp; HANDLE file;

6 years, 9 months

01/02: [DSOUND] Check arguments in IDirectSoundFullDuplex::Initialize. This prevents a crash in winetest_dsound:duplex

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=775e2aea3cc85508f8965… commit 775e2aea3cc85508f8965660ab8486b1ec3869b6 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Mar 18 15:56:59 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 18 15:58:04 2018 +0100 [DSOUND] Check arguments in IDirectSoundFullDuplex::Initialize. This prevents a crash in winetest_dsound:duplex --- dll/directx/wine/dsound/duplex.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/directx/wine/dsound/duplex.c b/dll/directx/wine/dsound/duplex.c index dbee1b16ba..5ab498ba19 100644 --- a/dll/directx/wine/dsound/duplex.c +++ b/dll/directx/wine/dsound/duplex.c @@ -535,6 +535,9 @@ IDirectSoundFullDuplexImpl_Initialize( lpDscBufferDesc, lpDsBufferDesc, hWnd, dwLevel, lplpDirectSoundCaptureBuffer8, lplpDirectSoundBuffer8); + if (!lplpDirectSoundCaptureBuffer8 || !lplpDirectSoundBuffer8) + return E_INVALIDARG; + if (This->renderer_device != NULL || This->capture_device != NULL) { WARN("already initialized\n"); *lplpDirectSoundCaptureBuffer8 = NULL;

6 years, 9 months

01/01: [WIN32K] Fix 64 bit issues (#420)

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d9c88e0c5f0c8fc24612… commit 2d9c88e0c5f0c8fc24612579659a57690e0560bf Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Mar 18 15:53:52 2018 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 18 15:53:52 2018 +0100 [WIN32K] Fix 64 bit issues (#420) - Fix ULONG/SIZE_T issues - Use LOWORD/HIWORD - Change a struct member to HANDLE - Implement lstrlenW helper function --- win32ss/gdi/ntgdi/dibobj.c | 2 +- win32ss/gdi/ntgdi/font.c | 4 ++-- win32ss/gdi/ntgdi/font.h | 2 +- win32ss/gdi/ntgdi/freetype.c | 10 +++++----- win32ss/gdi/ntgdi/gdidbg.c | 2 +- win32ss/gdi/ntgdi/gdiobj.c | 2 +- win32ss/gdi/ntgdi/misc.h | 19 ------------------- win32ss/gdi/ntgdi/palette.c | 4 ++-- win32ss/gdi/ntgdi/text.c | 3 ++- win32ss/include/callback.h | 2 +- win32ss/include/ntuser.h | 8 ++++---- win32ss/user/ntuser/class.c | 2 +- win32ss/user/ntuser/csr.c | 7 +++---- win32ss/user/ntuser/defwnd.c | 2 +- win32ss/user/ntuser/desktop.c | 4 ++-- win32ss/user/ntuser/event.c | 4 ++-- win32ss/user/ntuser/focus.c | 2 +- win32ss/user/ntuser/hook.c | 4 ++-- win32ss/user/ntuser/hook.h | 2 +- win32ss/user/ntuser/input.c | 4 ++-- win32ss/user/ntuser/kbdlayout.c | 10 +++++----- win32ss/user/ntuser/keyboard.c | 3 ++- win32ss/user/ntuser/menu.c | 9 +++++++-- win32ss/user/ntuser/message.c | 2 +- win32ss/user/ntuser/misc/registry.c | 13 +++++++------ win32ss/user/ntuser/nonclient.c | 4 ++-- win32ss/user/ntuser/ntuser.h | 20 ++++++++++++++++++++ win32ss/user/ntuser/object.c | 8 ++++---- win32ss/user/ntuser/painting.c | 4 ++-- win32ss/user/ntuser/simplecall.c | 4 ++-- win32ss/user/ntuser/sysparams.c | 8 ++++---- win32ss/user/ntuser/win32.h | 14 ++++++++++++++ win32ss/user/ntuser/window.c | 4 ++-- win32ss/user/ntuser/winsta.c | 2 +- win32ss/user/rtl/text.c | 8 -------- 35 files changed, 108 insertions(+), 94 deletions(-) diff --git a/win32ss/gdi/ntgdi/dibobj.c b/win32ss/gdi/ntgdi/dibobj.c index 9a3d848935..f935bc5d54 100644 --- a/win32ss/gdi/ntgdi/dibobj.c +++ b/win32ss/gdi/ntgdi/dibobj.c @@ -1814,7 +1814,7 @@ DIB_CreateDIBSection( if (mapBits) bm.bmBits = (char *)mapBits + (offset - mapOffset); } else if (ovr_pitch && offset) - bm.bmBits = (LPVOID) offset; + bm.bmBits = UlongToPtr(offset); else { offset = 0; diff --git a/win32ss/gdi/ntgdi/font.c b/win32ss/gdi/ntgdi/font.c index f106ef28fe..7d1aebbb66 100644 --- a/win32ss/gdi/ntgdi/font.c +++ b/win32ss/gdi/ntgdi/font.c @@ -446,10 +446,10 @@ NtGdiAddFontResourceW( DPRINT("NtGdiAddFontResourceW\n"); /* cwc = Length + trailing zero. */ - if (cwc <= 1 || cwc > UNICODE_STRING_MAX_CHARS) + if ((cwc <= 1) || (cwc > UNICODE_STRING_MAX_CHARS)) return 0; - SafeFileName.MaximumLength = cwc * sizeof(WCHAR); + SafeFileName.MaximumLength = (USHORT)(cwc * sizeof(WCHAR)); SafeFileName.Length = SafeFileName.MaximumLength - sizeof(UNICODE_NULL); SafeFileName.Buffer = ExAllocatePoolWithTag(PagedPool, SafeFileName.MaximumLength, diff --git a/win32ss/gdi/ntgdi/font.h b/win32ss/gdi/ntgdi/font.h index 5cefc9deeb..8d466bd2ec 100644 --- a/win32ss/gdi/ntgdi/font.h +++ b/win32ss/gdi/ntgdi/font.h @@ -18,7 +18,7 @@ typedef struct _FONT_ENTRY_MEM typedef struct _FONT_ENTRY_COLL_MEM { LIST_ENTRY ListEntry; - UINT Handle; + HANDLE Handle; FONT_ENTRY_MEM *Entry; } FONT_ENTRY_COLL_MEM, *PFONT_ENTRY_COLL_MEM; diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 92ab8b4461..6417012381 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1081,7 +1081,7 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics) PVOID Buffer = NULL; IO_STATUS_BLOCK Iosb; PVOID SectionObject; - ULONG ViewSize = 0; + SIZE_T ViewSize = 0; LARGE_INTEGER SectionSize; OBJECT_ATTRIBUTES ObjectAttributes; GDI_LOAD_FONT LoadFont; @@ -1168,7 +1168,7 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics) Status = ZwOpenKey(&KeyHandle, KEY_WRITE, &ObjectAttributes); if (NT_SUCCESS(Status)) { - ULONG DataSize; + SIZE_T DataSize; LPWSTR pFileName = wcsrchr(FileName->Buffer, L'\\'); if (pFileName) { @@ -1225,10 +1225,10 @@ IntGdiAddFontMemResource(PVOID Buffer, DWORD dwSize, PDWORD pNumAdded) PPROCESSINFO Win32Process = PsGetCurrentProcessWin32Process(); EntryCollection->Entry = LoadFont.PrivateEntry; IntLockProcessPrivateFonts(Win32Process); - EntryCollection->Handle = ++Win32Process->PrivateMemFontHandleCount; + EntryCollection->Handle = ULongToHandle(++Win32Process->PrivateMemFontHandleCount); InsertTailList(&Win32Process->PrivateMemFontListHead, &EntryCollection->ListEntry); IntUnLockProcessPrivateFonts(Win32Process); - Ret = (HANDLE)EntryCollection->Handle; + Ret = EntryCollection->Handle; } } *pNumAdded = FaceCount; @@ -1302,7 +1302,7 @@ IntGdiRemoveFontMemResource(HANDLE hMMFont) { CurrentEntry = CONTAINING_RECORD(Entry, FONT_ENTRY_COLL_MEM, ListEntry); - if (CurrentEntry->Handle == (UINT)hMMFont) + if (CurrentEntry->Handle == hMMFont) { EntryCollection = CurrentEntry; UnlinkFontMemCollection(CurrentEntry); diff --git a/win32ss/gdi/ntgdi/gdidbg.c b/win32ss/gdi/ntgdi/gdidbg.c index 9c9eb76b64..27297fb0ec 100644 --- a/win32ss/gdi/ntgdi/gdidbg.c +++ b/win32ss/gdi/ntgdi/gdidbg.c @@ -365,7 +365,7 @@ DbgGdiHTIntegrityCheck(VOID) pEntry = &GdiHandleTable->Entries[i]; Type = pEntry->Type; - Handle = (HGDIOBJ)((Type << GDI_ENTRY_UPPER_SHIFT) + i); + Handle = (HGDIOBJ)(((ULONG_PTR)Type << GDI_ENTRY_UPPER_SHIFT) + i); if (Type & GDI_ENTRY_BASETYPE_MASK) { diff --git a/win32ss/gdi/ntgdi/gdiobj.c b/win32ss/gdi/ntgdi/gdiobj.c index da7488c16c..03d71ebdaf 100644 --- a/win32ss/gdi/ntgdi/gdiobj.c +++ b/win32ss/gdi/ntgdi/gdiobj.c @@ -1515,7 +1515,7 @@ GDI_MapHandleTable(PEPROCESS pProcess) PVOID pvMappedView = NULL; NTSTATUS Status; LARGE_INTEGER liOffset; - ULONG cjViewSize = sizeof(GDI_HANDLE_TABLE); + SIZE_T cjViewSize = sizeof(GDI_HANDLE_TABLE); liOffset.QuadPart = 0; diff --git a/win32ss/gdi/ntgdi/misc.h b/win32ss/gdi/ntgdi/misc.h index 547a8a99a0..12c7a73351 100644 --- a/win32ss/gdi/ntgdi/misc.h +++ b/win32ss/gdi/ntgdi/misc.h @@ -54,25 +54,6 @@ BOOL NTAPI RegReadDWORD(HKEY hkey, PWSTR pwszValue, PDWORD pdwData); -_Success_(return!=FALSE) -BOOL -NTAPI -RegReadUserSetting( - _In_z_ PCWSTR pwszKeyName, - _In_z_ PCWSTR pwszValueName, - _In_ ULONG ulType, - _Out_writes_(cbDataSize) _When_(ulType == REG_SZ, _Post_z_) PVOID pvData, - _In_ ULONG cbDataSize); - -BOOL -NTAPI -RegWriteUserSetting( - IN PCWSTR pwszKeyName, - IN PCWSTR pwszValueName, - IN ULONG ulType, - OUT PVOID pvData, - IN ULONG cbDataSize); - VOID FASTCALL SetLastNtError( NTSTATUS Status); diff --git a/win32ss/gdi/ntgdi/palette.c b/win32ss/gdi/ntgdi/palette.c index 7c830afab1..ef4509153e 100644 --- a/win32ss/gdi/ntgdi/palette.c +++ b/win32ss/gdi/ntgdi/palette.c @@ -963,7 +963,7 @@ IntSetPaletteEntries( PPALETTE palGDI; ULONG numEntries; - if ((UINT)hpal & GDI_HANDLE_STOCK_MASK) + if ((UINT_PTR)hpal & GDI_HANDLE_STOCK_MASK) { return 0; } @@ -1247,7 +1247,7 @@ NtGdiUnrealizeObject(HGDIOBJ hgdiobj) PPALETTE palGDI; if ( !hgdiobj || - ((UINT)hgdiobj & GDI_HANDLE_STOCK_MASK) || + ((UINT_PTR)hgdiobj & GDI_HANDLE_STOCK_MASK) || !GDI_HANDLE_IS_TYPE(hgdiobj, GDI_OBJECT_TYPE_PALETTE) ) return Ret; diff --git a/win32ss/gdi/ntgdi/text.c b/win32ss/gdi/ntgdi/text.c index b4130b6b2f..5c7e3664f2 100644 --- a/win32ss/gdi/ntgdi/text.c +++ b/win32ss/gdi/ntgdi/text.c @@ -496,7 +496,8 @@ NtGdiGetTextFaceW( HFONT hFont; PTEXTOBJ TextObj; NTSTATUS Status; - INT fLen, ret; + SIZE_T fLen; + INT ret; /* FIXME: Handle bAliasName */ diff --git a/win32ss/include/callback.h b/win32ss/include/callback.h index 20ec95afe7..bc8caecb67 100644 --- a/win32ss/include/callback.h +++ b/win32ss/include/callback.h @@ -80,7 +80,7 @@ typedef struct _EVENTPROC_CALLBACK_ARGUMENTS DWORD dwEventThread; DWORD dwmsEventTime; WINEVENTPROC Proc; - INT Mod; + INT_PTR Mod; ULONG_PTR offPfn; } EVENTPROC_CALLBACK_ARGUMENTS, *PEVENTPROC_CALLBACK_ARGUMENTS; diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index d3661fb779..724e3e612c 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -219,7 +219,7 @@ typedef struct tagHOOK int HookId; /* Hook table index */ ULONG_PTR offPfn; ULONG flags; /* Some internal flags */ - INT ihmod; + INT_PTR ihmod; struct _THREADINFO *ptiHooked; struct _DESKTOP *rpdesk; /* ReactOS */ @@ -692,7 +692,7 @@ typedef struct _WND HMENU SystemMenu; //PMENU spmenuSys; /* Window menu handle or window id */ - UINT IDMenu; // Use spmenu + UINT_PTR IDMenu; // Use spmenu //PMENU spmenu; HRGN hrgnClip; HRGN hrgnNewFrame; @@ -1662,14 +1662,14 @@ DWORD NTAPI NtUserCallHwndParam( HWND hWnd, - DWORD Param, + DWORD_PTR Param, DWORD Routine); DWORD NTAPI NtUserCallHwndParamLock( HWND hWnd, - DWORD Param, + DWORD_PTR Param, DWORD Routine); BOOL diff --git a/win32ss/user/ntuser/class.c b/win32ss/user/ntuser/class.c index d5c1324646..5982d6b9e3 100644 --- a/win32ss/user/ntuser/class.c +++ b/win32ss/user/ntuser/class.c @@ -2343,7 +2343,7 @@ UserRegisterSystemClasses(VOID) hBrush = DefaultServerClasses[i].hBrush; if (hBrush <= (HBRUSH)COLOR_MENUBAR) { - hBrush = IntGetSysColorBrush((INT)hBrush); + hBrush = IntGetSysColorBrush(HandleToUlong(hBrush)); } wc.hbrBackground = hBrush; wc.lpszMenuName = NULL; diff --git a/win32ss/user/ntuser/csr.c b/win32ss/user/ntuser/csr.c index e9f7d13974..7893cb53c0 100644 --- a/win32ss/user/ntuser/csr.c +++ b/win32ss/user/ntuser/csr.c @@ -87,10 +87,9 @@ CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, /* Fill out the Port Message Header */ ApiMessage->Header.u2.ZeroInit = 0; - ApiMessage->Header.u1.s1.TotalLength = DataLength + - sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data); // FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; - ApiMessage->Header.u1.s1.DataLength = DataLength + - FIELD_OFFSET(CSR_API_MESSAGE, Data) - sizeof(ApiMessage->Header); // ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); + ApiMessage->Header.u1.s1.TotalLength = FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; + ApiMessage->Header.u1.s1.DataLength = ApiMessage->Header.u1.s1.TotalLength - + sizeof(ApiMessage->Header); /* Fill out the CSR Header */ ApiMessage->ApiNumber = ApiNumber; diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c index f509473011..367c5faac9 100644 --- a/win32ss/user/ntuser/defwnd.c +++ b/win32ss/user/ntuser/defwnd.c @@ -967,7 +967,7 @@ IntDefWindowProc( if (!hBrush) return 0; if (hBrush <= (HBRUSH)COLOR_MENUBAR) { - hBrush = IntGetSysColorBrush((INT)hBrush); + hBrush = IntGetSysColorBrush(HandleToUlong(hBrush)); } if (Wnd->pcls->style & CS_PARENTDC) { diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index 9f2e3b4d81..7fe1a37096 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -1427,7 +1427,7 @@ IntPaintDesktop(HDC hDC) // We expect at most 4 strings (3 for version, 1 for optional NtSystemRoot) static POLYTEXTW VerStrs[4] = {{0},{0},{0},{0}}; INT i = 0; - INT len; + SIZE_T len; HFONT hFont1 = NULL, hFont2 = NULL, hOldFont = NULL; COLORREF crText, color_old; @@ -1503,7 +1503,7 @@ IntPaintDesktop(HDC hDC) PWCHAR pstr = wszzVersion; for (i = 0; (i < ARRAYSIZE(VerStrs)) && *pstr; ++i) { - VerStrs[i].n = wcslen(pstr); + VerStrs[i].n = lstrlenW(pstr); VerStrs[i].lpstr = pstr; pstr += (VerStrs[i].n + 1); } diff --git a/win32ss/user/ntuser/event.c b/win32ss/user/ntuser/event.c index d4063313aa..a82516cdcf 100644 --- a/win32ss/user/ntuser/event.c +++ b/win32ss/user/ntuser/event.c @@ -388,14 +388,14 @@ NtUserSetWinEventHook( if (hmodWinEventProc != NULL) { pEH->offPfn = (ULONG_PTR)((char *)lpfnWinEventProc - (char *)hmodWinEventProc); - pEH->ihmod = (INT)hmodWinEventProc; + pEH->ihmod = (INT_PTR)hmodWinEventProc; pEH->Proc = lpfnWinEventProc; } else { pEH->Proc = lpfnWinEventProc; pEH->offPfn = 0; - pEH->ihmod = (INT)hmodWinEventProc; + pEH->ihmod = (INT_PTR)hmodWinEventProc; } UserDereferenceObject(pEH); diff --git a/win32ss/user/ntuser/focus.c b/win32ss/user/ntuser/focus.c index 5e2ea74b7b..cc9ac5f8f5 100644 --- a/win32ss/user/ntuser/focus.c +++ b/win32ss/user/ntuser/focus.c @@ -1490,7 +1490,7 @@ IntAllowSetForegroundWindow(DWORD dwProcessId) ppi = NULL; if (dwProcessId != ASFW_ANY) { - if (!NT_SUCCESS(PsLookupProcessByProcessId((HANDLE)dwProcessId, &Process))) + if (!NT_SUCCESS(PsLookupProcessByProcessId(UlongToHandle(dwProcessId), &Process))) { EngSetLastError(ERROR_INVALID_PARAMETER); return FALSE; diff --git a/win32ss/user/ntuser/hook.c b/win32ss/user/ntuser/hook.c index 9cc0f5c748..558f3f975a 100644 --- a/win32ss/user/ntuser/hook.c +++ b/win32ss/user/ntuser/hook.c @@ -1470,7 +1470,7 @@ NtUserSetWindowsHookEx( HINSTANCE Mod, RETURN( NULL); } - if ( !(ptiHook = IntTID2PTI( (HANDLE)ThreadId ))) + if ( !(ptiHook = IntTID2PTI( UlongToHandle(ThreadId) ))) { ERR("Invalid thread id 0x%x\n", ThreadId); EngSetLastError(ERROR_INVALID_PARAMETER); @@ -1556,7 +1556,7 @@ NtUserSetWindowsHookEx( HINSTANCE Mod, RETURN( NULL); } - Hook->ihmod = (INT)Mod; // Module Index from atom table, Do this for now. + Hook->ihmod = (INT_PTR)Mod; // Module Index from atom table, Do this for now. Hook->HookId = HookId; Hook->rpdesk = ptiHook->rpdesk; Hook->phkNext = NULL; /* Dont use as a chain! Use link lists for chaining. */ diff --git a/win32ss/user/ntuser/hook.h b/win32ss/user/ntuser/hook.h index d64af1da01..3eb0ad4660 100644 --- a/win32ss/user/ntuser/hook.h +++ b/win32ss/user/ntuser/hook.h @@ -23,7 +23,7 @@ typedef struct tagEVENTHOOK WINEVENTPROC Proc; /* Event function */ ULONG Flags; /* Some internal flags */ ULONG_PTR offPfn; - INT ihmod; + INT_PTR ihmod; } EVENTHOOK, *PEVENTHOOK; typedef struct tagEVENTTABLE diff --git a/win32ss/user/ntuser/input.c b/win32ss/user/ntuser/input.c index b004006737..509fcda6e9 100644 --- a/win32ss/user/ntuser/input.c +++ b/win32ss/user/ntuser/input.c @@ -677,8 +677,8 @@ NtUserAttachThreadInput( UserEnterExclusive(); TRACE("Enter NtUserAttachThreadInput %s\n",(fAttach ? "TRUE" : "FALSE" )); - pti = IntTID2PTI((HANDLE)idAttach); - ptiTo = IntTID2PTI((HANDLE)idAttachTo); + pti = IntTID2PTI(UlongToHandle(idAttach)); + ptiTo = IntTID2PTI(UlongToHandle(idAttachTo)); if ( !pti || !ptiTo ) { diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index e123438866..cd57492d99 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -156,7 +156,7 @@ UserLoadKbdFile(PUNICODE_STRING pwszKLID) } /* Read filename of layout DLL */ - cbSize = sizeof(wszLayoutPath) - wcslen(wszLayoutPath)*sizeof(WCHAR); + cbSize = (ULONG)(sizeof(wszLayoutPath) - wcslen(wszLayoutPath)*sizeof(WCHAR)); Status = RegQueryValue(hKey, L"Layout File", REG_SZ, @@ -632,7 +632,7 @@ NtUserLoadKeyboardLayoutEx( UserEnterExclusive(); /* If hklUnload is specified, unload it and load new layput as default */ - if (hklUnload && hklUnload != (HKL)hkl) + if (hklUnload && (hklUnload != UlongToHandle(hkl))) { pKl = UserHklToKbl(hklUnload); if (pKl) @@ -640,11 +640,11 @@ NtUserLoadKeyboardLayoutEx( } /* Let's see if layout was already loaded. */ - pKl = UserHklToKbl((HKL)hkl); + pKl = UserHklToKbl(UlongToHandle(hkl)); if (!pKl) { /* It wasn't, so load it. */ - pKl = UserLoadKbdLayout(&ustrSafeKLID, (HKL)hkl); + pKl = UserLoadKbdLayout(&ustrSafeKLID, UlongToHandle(hkl)); if (!pKl) goto cleanup; @@ -682,7 +682,7 @@ NtUserLoadKeyboardLayoutEx( co_IntShellHookNotify(HSHELL_LANGUAGE, 0, (LPARAM)hkl); /* Return hkl on success */ - hklRet = (HKL)hkl; + hklRet = UlongToHandle(hkl); /* FIXME: KLF_REPLACELANG KLF_REORDER */ diff --git a/win32ss/user/ntuser/keyboard.c b/win32ss/user/ntuser/keyboard.c index d2cba89bc7..6167f9d6ff 100644 --- a/win32ss/user/ntuser/keyboard.c +++ b/win32ss/user/ntuser/keyboard.c @@ -1407,7 +1407,8 @@ APIENTRY NtUserGetKeyNameText(LONG lParam, LPWSTR lpString, int cchSize) { PTHREADINFO pti; - DWORD i, cchKeyName, dwRet = 0; + DWORD i, dwRet = 0; + SIZE_T cchKeyName; WORD wScanCode = (lParam >> 16) & 0xFF; BOOL bExtKey = (HIWORD(lParam) & KF_EXTENDED) ? TRUE : FALSE; PKBDTABLES pKbdTbl; diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index ccaed593df..1e29d1d178 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -1170,7 +1170,12 @@ IntSetMenuItemInfo(PMENU MenuObject, PITEM MenuItem, PROSMENUITEMINFO lpmii, PUN { UNICODE_STRING Source; - Source.Length = Source.MaximumLength = lpmii->cch * sizeof(WCHAR); + if (!NT_VERIFY(lpmii->cch <= UNICODE_STRING_MAX_CHARS)) + { + return FALSE; + } + + Source.Length = Source.MaximumLength = (USHORT)(lpmii->cch * sizeof(WCHAR)); Source.Buffer = lpmii->dwTypeData; MenuItem->lpstr.Buffer = DesktopHeapAlloc( MenuObject->head.rpdesk, Source.Length + sizeof(WCHAR)); @@ -5288,7 +5293,7 @@ IntSetMenu( } - Wnd->IDMenu = (UINT) Menu; + Wnd->IDMenu = (UINT_PTR) Menu; if (NULL != NewMenu) { NewMenu->hWnd = UserHMGetHandle(Wnd); diff --git a/win32ss/user/ntuser/message.c b/win32ss/user/ntuser/message.c index 61835863fd..c8cfededfb 100644 --- a/win32ss/user/ntuser/message.c +++ b/win32ss/user/ntuser/message.c @@ -2090,7 +2090,7 @@ NtUserPostThreadMessage(DWORD idThread, UserEnterExclusive(); - Status = PsLookupThreadByThreadId((HANDLE)idThread,&peThread); + Status = PsLookupThreadByThreadId(UlongToHandle(idThread), &peThread); if ( Status == STATUS_SUCCESS ) { diff --git a/win32ss/user/ntuser/misc/registry.c b/win32ss/user/ntuser/misc/registry.c index a1995aba05..0e03e791da 100644 --- a/win32ss/user/ntuser/misc/registry.c +++ b/win32ss/user/ntuser/misc/registry.c @@ -263,14 +263,15 @@ RegReadUserSetting( return NT_SUCCESS(Status); } +_Success_(return != FALSE) BOOL NTAPI RegWriteUserSetting( - IN PCWSTR pwszKeyName, - IN PCWSTR pwszValueName, - IN ULONG ulType, - OUT PVOID pvData, - IN ULONG cbDataSize) + _In_z_ PCWSTR pwszKeyName, + _In_z_ PCWSTR pwszValueName, + _In_ ULONG ulType, + _In_reads_bytes_(cjDataSize) const VOID *pvData, + _In_ ULONG cbDataSize) { NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; @@ -337,7 +338,7 @@ RegWriteUserSetting( /* Initialize the value name string */ RtlInitUnicodeString(&usValueName, pwszValueName); - Status = ZwSetValueKey(hkey, &usValueName, 0, ulType, pvData, cbDataSize); + Status = ZwSetValueKey(hkey, &usValueName, 0, ulType, (PVOID)pvData, cbDataSize); if(!NT_SUCCESS(Status)) { DPRINT1("Failed to write reg key '%S' value '%S', Status = %lx\n", diff --git a/win32ss/user/ntuser/nonclient.c b/win32ss/user/ntuser/nonclient.c index 8c30fa6900..44476f8cee 100644 --- a/win32ss/user/ntuser/nonclient.c +++ b/win32ss/user/ntuser/nonclient.c @@ -808,8 +808,8 @@ NC_DrawFrame( HDC hDC, RECT *CurrentRect, BOOL Active, DWORD Style, DWORD ExStyl /* Now the other bit of the frame */ if (Style & (WS_DLGFRAME | WS_BORDER) || ExStyle & WS_EX_DLGMODALFRAME) { - DWORD Width = UserGetSystemMetrics(SM_CXBORDER); - DWORD Height = UserGetSystemMetrics(SM_CYBORDER); + LONG Width = UserGetSystemMetrics(SM_CXBORDER); + LONG Height = UserGetSystemMetrics(SM_CYBORDER); NtGdiSelectBrush(hDC, IntGetSysColorBrush( (ExStyle & (WS_EX_DLGMODALFRAME | WS_EX_CLIENTEDGE)) ? COLOR_3DFACE : diff --git a/win32ss/user/ntuser/ntuser.h b/win32ss/user/ntuser/ntuser.h index 79af19d4c0..abd75ce06b 100644 --- a/win32ss/user/ntuser/ntuser.h +++ b/win32ss/user/ntuser/ntuser.h @@ -28,4 +28,24 @@ BOOL FASTCALL UserIsEntered(VOID); BOOL FASTCALL UserIsEnteredExclusive(VOID); DWORD FASTCALL UserGetLanguageToggle(VOID); +_Success_(return != FALSE) +BOOL +NTAPI +RegReadUserSetting( + _In_z_ PCWSTR pwszKeyName, + _In_z_ PCWSTR pwszValueName, + _In_ ULONG ulType, + _Out_writes_bytes_(cjDataSize) _When_(ulType == REG_SZ, _Post_z_) PVOID pvData, + _In_ ULONG cjDataSize); + +_Success_(return != FALSE) +BOOL +NTAPI +RegWriteUserSetting( + _In_z_ PCWSTR pwszKeyName, + _In_z_ PCWSTR pwszValueName, + _In_ ULONG ulType, + _In_reads_bytes_(cjDataSize) const VOID *pvData, + _In_ ULONG cjDataSize); + /* EOF */ diff --git a/win32ss/user/ntuser/object.c b/win32ss/user/ntuser/object.c index 8fac269c1c..05ed7eebd5 100644 --- a/win32ss/user/ntuser/object.c +++ b/win32ss/user/ntuser/object.c @@ -308,12 +308,12 @@ void DbgUserDumpHandleTable(VOID) PUSER_HANDLE_ENTRY handle_to_entry(PUSER_HANDLE_TABLE ht, HANDLE handle ) { unsigned short generation; - int index = (((unsigned int)handle & 0xffff) - FIRST_USER_HANDLE) >> 1; + int index = (LOWORD(handle) - FIRST_USER_HANDLE) >> 1; if (index < 0 || index >= ht->nb_handles) return NULL; if (!ht->handles[index].type) return NULL; - generation = (unsigned int)handle >> 16; + generation = HIWORD(handle); if (generation == ht->handles[index].generation || !generation || generation == 0xffff) return &ht->handles[index]; return NULL; @@ -322,7 +322,7 @@ PUSER_HANDLE_ENTRY handle_to_entry(PUSER_HANDLE_TABLE ht, HANDLE handle ) __inline static HANDLE entry_to_handle(PUSER_HANDLE_TABLE ht, PUSER_HANDLE_ENTRY ptr ) { int index = ptr - ht->handles; - return (HANDLE)(((index << 1) + FIRST_USER_HANDLE) + (ptr->generation << 16)); + return (HANDLE)((((INT_PTR)index << 1) + FIRST_USER_HANDLE) + (ptr->generation << 16)); } __inline static PUSER_HANDLE_ENTRY alloc_user_entry(PUSER_HANDLE_TABLE ht) @@ -479,7 +479,7 @@ HANDLE get_user_full_handle(PUSER_HANDLE_TABLE ht, HANDLE handle ) { PUSER_HANDLE_ENTRY entry; - if ((unsigned int)handle >> 16) + if ((ULONG_PTR)handle >> 16) return handle; if (!(entry = handle_to_entry(ht, handle ))) return handle; diff --git a/win32ss/user/ntuser/painting.c b/win32ss/user/ntuser/painting.c index 49528e555b..5b4d04ff20 100644 --- a/win32ss/user/ntuser/painting.c +++ b/win32ss/user/ntuser/painting.c @@ -1310,13 +1310,13 @@ BOOL FASTCALL IntFlashWindowEx(PWND pWnd, PFLASHWINFO pfwi) { - DWORD FlashState; + DWORD_PTR FlashState; UINT uCount = pfwi->uCount; BOOL Activate = FALSE, Ret = FALSE; ASSERT(pfwi); - FlashState = (DWORD)UserGetProp(pWnd, AtomFlashWndState, TRUE); + FlashState = (DWORD_PTR)UserGetProp(pWnd, AtomFlashWndState, TRUE); if (FlashState == FLASHW_FINISHED) { diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index 8296b8d2cd..c7ad21fca0 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -725,7 +725,7 @@ DWORD APIENTRY NtUserCallHwndParam( HWND hWnd, - DWORD Param, + DWORD_PTR Param, DWORD Routine) { @@ -834,7 +834,7 @@ DWORD APIENTRY NtUserCallHwndParamLock( HWND hWnd, - DWORD Param, + DWORD_PTR Param, DWORD Routine) { DWORD Ret = FALSE; diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c index 2265219586..c7dca11730 100644 --- a/win32ss/user/ntuser/sysparams.c +++ b/win32ss/user/ntuser/sysparams.c @@ -382,7 +382,7 @@ SpiStoreSz(PCWSTR pwszKey, PCWSTR pwszValue, PCWSTR pwsz) RegWriteUserSetting(pwszKey, pwszValue, REG_SZ, - (PWSTR)pwsz, + pwsz, (wcslen(pwsz) + 1) * sizeof(WCHAR)); } @@ -561,7 +561,7 @@ UINT_PTR SpiSetUserPref(DWORD dwMask, PVOID pvValue, FLONG fl) { DWORD dwRegMask; - BOOL bValue = (BOOL)pvValue; + BOOL bValue = PtrToUlong(pvValue); REQ_INTERACTIVE_WINSTA(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION); @@ -1612,7 +1612,7 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl) return SpiGetUserPref(UPM_CURSORSHADOW, pvParam, fl); case SPI_SETCURSORSHADOW: - gspv.bMouseCursorShadow = (BOOL)pvParam; + gspv.bMouseCursorShadow = PtrToUlong(pvParam); return SpiSetUserPref(UPM_CURSORSHADOW, pvParam, fl); case SPI_GETUIEFFECTS: @@ -1631,7 +1631,7 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl) return SpiGetUserPref(UPM_CLICKLOCK, pvParam, fl); case SPI_SETMOUSECLICKLOCK: - gspv.bMouseClickLock = (BOOL)pvParam; + gspv.bMouseClickLock = PtrToUlong(pvParam); return SpiSetUserPref(UPM_CLICKLOCK, pvParam, fl); case SPI_GETMOUSEVANISH: diff --git a/win32ss/user/ntuser/win32.h b/win32ss/user/ntuser/win32.h index cd9d7961ec..4fede2b1f9 100644 --- a/win32ss/user/ntuser/win32.h +++ b/win32ss/user/ntuser/win32.h @@ -295,3 +295,17 @@ typedef struct _PROCESSINFO void NTAPI UserDbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments); ULONG_PTR NTAPI UserDbgPostServiceHook(ULONG ulSyscallId, ULONG_PTR ulResult); #endif + +/* Helper function used by some wine code */ + +__forceinline +int +lstrlenW( + _In_ LPCWSTR lpString) +{ + size_t size = wcslen(lpString); + if (size > ULONG_MAX) __fastfail(FAST_FAIL_RANGE_CHECK_FAILURE); + return (int)size; +} + +#define strlenW lstrlenW diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index b52e3dcfe9..06dabf37cb 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -1385,7 +1385,7 @@ NtUserBuildHwndList( PWND Window; HWND *List = NULL; - Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread); + Status = PsLookupThreadByThreadId(UlongToHandle(dwThreadId), &Thread); if (!NT_SUCCESS(Status)) { ERR("Thread Id is not valid!\n"); @@ -1840,7 +1840,7 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, } } else // Not a child - pWnd->IDMenu = (UINT) Cs->hMenu; + pWnd->IDMenu = (UINT_PTR)Cs->hMenu; if ( ParentWindow && diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index 49702059d7..1187e44055 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -676,7 +676,7 @@ NtUserGetObjectInformation( PDESKTOP DesktopObject = NULL; USEROBJECTFLAGS ObjectFlags; PVOID pvData = NULL; - DWORD nDataSize = 0; + SIZE_T nDataSize = 0; _SEH2_TRY { diff --git a/win32ss/user/rtl/text.c b/win32ss/user/rtl/text.c index f278bffec4..f1ed9d714d 100644 --- a/win32ss/user/rtl/text.c +++ b/win32ss/user/rtl/text.c @@ -163,11 +163,7 @@ static void TEXT_Ellipsify (HDC hdc, WCHAR *str, unsigned int max_len, { unsigned int len_ellipsis; unsigned int lo, mid, hi; -#ifdef _WIN32K_ - len_ellipsis = wcslen (ELLIPSISW); -#else len_ellipsis = strlenW (ELLIPSISW); -#endif if (len_ellipsis > max_len) len_ellipsis = max_len; if (*len_str > max_len - len_ellipsis) *len_str = max_len - len_ellipsis; @@ -274,11 +270,7 @@ static void TEXT_PathEllipsify (HDC hdc, WCHAR *str, unsigned int max_len, int len_trailing; int len_under; WCHAR *lastBkSlash, *lastFwdSlash, *lastSlash; -#ifdef _WIN32K_ - len_ellipsis = wcslen (ELLIPSISW); -#else len_ellipsis = strlenW (ELLIPSISW); -#endif if (!max_len) return; if (len_ellipsis >= max_len) len_ellipsis = max_len - 1; if (*len_str + len_ellipsis >= max_len)

6 years, 9 months

01/01: [SNDVOL32] Add the ability to select the record mode by using the /r option and select the right mixer after changing the mixer preferences

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b2ff8a3f98f0f2eb6232… commit 5b2ff8a3f98f0f2eb62321d35ff61b8bfcb938f0 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 18 14:15:12 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 18 14:15:12 2018 +0100 [SNDVOL32] Add the ability to select the record mode by using the /r option and select the right mixer after changing the mixer preferences --- base/applications/sndvol32/mixer.c | 4 ++-- base/applications/sndvol32/sndvol32.c | 24 ++++++++++++------------ base/applications/sndvol32/sndvol32.h | 3 ++- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/base/applications/sndvol32/mixer.c b/base/applications/sndvol32/mixer.c index 6de6ed4b53..1f1be9451e 100644 --- a/base/applications/sndvol32/mixer.c +++ b/base/applications/sndvol32/mixer.c @@ -66,7 +66,7 @@ ClearMixerCache(PSND_MIXER Mixer) } PSND_MIXER -SndMixerCreate(HWND hWndNotification) +SndMixerCreate(HWND hWndNotification, UINT MixerId) { PSND_MIXER Mixer = (PSND_MIXER) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -80,7 +80,7 @@ SndMixerCreate(HWND hWndNotification) if (Mixer->MixersCount > 0) { /* select the first mixer by default */ - SndMixerSelect(Mixer, 0); + SndMixerSelect(Mixer, MixerId); } } diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index 44c4b44956..4e3523ff7f 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -537,7 +537,7 @@ DlgPreferencesProc(HWND hwndDlg, (LONG_PTR)lParam); Context = (PPREFERENCES_CONTEXT)((LONG_PTR)lParam); Context->hwndDlg = hwndDlg; - Context->Mixer = SndMixerCreate(hwndDlg); + Context->Mixer = SndMixerCreate(hwndDlg, Context->MixerWindow->MixerId); Context->Selected = (UINT)-1; FillDevContext.PrefContext = Context; @@ -805,7 +805,7 @@ MainWindowProc(HWND hwnd, TCHAR szProduct[MAXPNAMELEN]; /* get mixer product name */ - if (SndMixerGetProductName(MixerWindow->Mixer, + if (SndMixerGetProductName(Pref.Mixer, szProduct, sizeof(szProduct) / sizeof(szProduct[0])) == -1) { @@ -962,7 +962,7 @@ MainWindowProc(HWND hwnd, GWL_USERDATA, (LONG_PTR)MixerWindow); MixerWindow->hWnd = hwnd; - MixerWindow->Mixer = SndMixerCreate(MixerWindow->hWnd); + MixerWindow->Mixer = SndMixerCreate(MixerWindow->hWnd, MixerWindow->MixerId); if (MixerWindow->Mixer != NULL) { TCHAR szProduct[MAXPNAMELEN]; @@ -1089,7 +1089,7 @@ UnregisterApplicationClasses(VOID) static HWND CreateApplicationWindow( WINDOW_MODE WindowMode, - BOOL bRecord) + UINT MixerId) { HWND hWnd; @@ -1102,7 +1102,7 @@ CreateApplicationWindow( } MixerWindow->Mode = WindowMode; - + MixerWindow->MixerId = MixerId; if (mixerGetNumDevs() > 0) { @@ -1152,11 +1152,11 @@ static BOOL HandleCommandLine(LPTSTR cmdline, PWINDOW_MODE pMode, - PBOOL pRecord) + PUINT pMixerId) { TCHAR option; - *pRecord = FALSE; + *pMixerId = 0; *pMode = SMALL_MODE; while (*cmdline == _T(' ') || *cmdline == _T('-') || *cmdline == _T('/')) @@ -1193,12 +1193,12 @@ HandleCommandLine(LPTSTR cmdline, case 'p': /* Play mode */ case 'P': - *pRecord = FALSE; + *pMixerId = 0; break; case 'r': /* Record mode */ case 'R': - *pRecord = TRUE; + *pMixerId = 1; break; default: @@ -1219,7 +1219,7 @@ _tWinMain(HINSTANCE hInstance, int Ret = 1; INITCOMMONCONTROLSEX Controls; WINDOW_MODE WindowMode = SMALL_MODE; - BOOL bRecord = FALSE; + UINT MixerId = 0; UNREFERENCED_PARAMETER(hPrevInstance); UNREFERENCED_PARAMETER(nCmdShow); @@ -1227,7 +1227,7 @@ _tWinMain(HINSTANCE hInstance, hAppInstance = hInstance; hAppHeap = GetProcessHeap(); - HandleCommandLine(lpszCmdLine, &WindowMode, &bRecord); + HandleCommandLine(lpszCmdLine, &WindowMode, &MixerId); if (InitAppConfig()) { @@ -1256,7 +1256,7 @@ _tWinMain(HINSTANCE hInstance, { if (RegisterApplicationClasses()) { - hMainWnd = CreateApplicationWindow(WindowMode, bRecord); + hMainWnd = CreateApplicationWindow(WindowMode, MixerId); if (hMainWnd != NULL) { BOOL bRet; diff --git a/base/applications/sndvol32/sndvol32.h b/base/applications/sndvol32/sndvol32.h index ad7311fa86..cd0192de78 100644 --- a/base/applications/sndvol32/sndvol32.h +++ b/base/applications/sndvol32/sndvol32.h @@ -38,6 +38,7 @@ typedef struct _MIXER_WINDOW HWND *Window; WINDOW_MODE Mode; + UINT MixerId; RECT rect; HFONT hFont; } MIXER_WINDOW, *PMIXER_WINDOW; @@ -123,7 +124,7 @@ typedef BOOL (CALLBACK *PFNSNDMIXENUMLINES)(PSND_MIXER Mixer, LPMIXERLINE Line, typedef BOOL (CALLBACK *PFNSNDMIXENUMCONNECTIONS)(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Context); typedef BOOL (CALLBACK *PFNSNDMIXENUMPRODUCTS)(PSND_MIXER Mixer, UINT Id, LPCTSTR ProductName, PVOID Context); -PSND_MIXER SndMixerCreate(HWND hWndNotification); +PSND_MIXER SndMixerCreate(HWND hWndNotification, UINT MixerId); VOID SndMixerDestroy(PSND_MIXER Mixer); VOID SndMixerClose(PSND_MIXER Mixer); BOOL SndMixerSelect(PSND_MIXER Mixer, UINT MixerId);

6 years, 9 months

02/02: [NTOSKRNL] In CcRosInternalFreeVacb(), in case of invalid free, also print file name.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a0e996c9d350987e4942… commit 2a0e996c9d350987e4942f2a6af53500fc87c53d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Mar 18 13:16:05 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Mar 18 13:21:54 2018 +0100 [NTOSKRNL] In CcRosInternalFreeVacb(), in case of invalid free, also print file name. CORE-14481 CORE-14480 CORE-14482 --- ntoskrnl/cc/view.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 24be8cb7aa..6a295504c3 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -939,6 +939,10 @@ CcRosInternalFreeVacb ( if (Vacb->PinCount != 0 || Vacb->ReferenceCount != 0) { DPRINT1("Invalid free: %ld, %ld\n", Vacb->ReferenceCount, Vacb->PinCount); + if (Vacb->SharedCacheMap->FileObject && Vacb->SharedCacheMap->FileObject->FileName.Length) + { + DPRINT1("For file: %wZ\n", &Vacb->SharedCacheMap->FileObject->FileName); + } } ASSERT(Vacb->PinCount == 0);

6 years, 9 months

01/02: [NTOSKRNL] In CcFlushCache(), release the VACB using CcRosReleaseVacb() Instead of reimplementing it partially and wrongly.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2fbba22789423d5959d32… commit 2fbba22789423d5959d32f201153effe3f14bb55 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Mar 18 13:11:05 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Mar 18 13:21:54 2018 +0100 [NTOSKRNL] In CcFlushCache(), release the VACB using CcRosReleaseVacb() Instead of reimplementing it partially and wrongly. CORE-14481 CORE-14480 CORE-14482 --- ntoskrnl/cc/view.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 4651abe670..24be8cb7aa 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -963,7 +963,6 @@ CcFlushCache ( LONGLONG RemainingLength; PROS_VACB current; NTSTATUS Status; - KIRQL oldIrql; CCTRACE(CC_API_DEBUG, "SectionObjectPointers=%p FileOffset=%p Length=%lu\n", SectionObjectPointers, FileOffset, Length); @@ -1006,13 +1005,7 @@ CcFlushCache ( } } - CcRosReleaseVacbLock(current); - - KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); - CcRosVacbDecRefCount(current); - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); - KeReleaseGuardedMutex(&ViewLock); + CcRosReleaseVacb(SharedCacheMap, current, current->Valid, current->Dirty, FALSE); } Offset.QuadPart += VACB_MAPPING_GRANULARITY;

6 years, 9 months

← Newer
1
...
22
23
24
25
26
27
28
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2018