Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/02: [MOUNTMGR] Fix bugs in MountMgrQueryDosVolumePath
by Victor Perevertkin 15 Dec '20

15 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9f5a787154a3886f96fb… commit f9f5a787154a3886f96fbae303474a054d103190 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Wed Dec 16 01:12:26 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Wed Dec 16 01:13:57 2020 +0300 [MOUNTMGR] Fix bugs in MountMgrQueryDosVolumePath - Do not access uninitialized SymlinkInformation on failure case and just return - Do not make an assumption that MOUNTMGR_TARGET_NAME has a zero-string --- drivers/storage/mountmgr/device.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/storage/mountmgr/device.c b/drivers/storage/mountmgr/device.c index ecdb0b21526..ad70f80c23f 100644 --- a/drivers/storage/mountmgr/device.c +++ b/drivers/storage/mountmgr/device.c @@ -865,7 +865,8 @@ MountMgrQueryDosVolumePath(IN PDEVICE_EXTENSION DeviceExtension, } /* Validate the entry structure size */ - if (Target->DeviceNameLength + sizeof(UNICODE_NULL) > Stack->Parameters.DeviceIoControl.InputBufferLength) + if ((FIELD_OFFSET(MOUNTMGR_TARGET_NAME, DeviceNameLength) + Target->DeviceNameLength) > + Stack->Parameters.DeviceIoControl.InputBufferLength) { return STATUS_INVALID_PARAMETER; } @@ -878,7 +879,7 @@ MountMgrQueryDosVolumePath(IN PDEVICE_EXTENSION DeviceExtension, /* Construct string for query */ SymbolicName.Length = Target->DeviceNameLength; - SymbolicName.MaximumLength = Target->DeviceNameLength + sizeof(UNICODE_NULL); + SymbolicName.MaximumLength = Target->DeviceNameLength; SymbolicName.Buffer = Target->DeviceName; /* Find device with our info */ @@ -911,7 +912,7 @@ MountMgrQueryDosVolumePath(IN PDEVICE_EXTENSION DeviceExtension, /* We didn't find, break */ if (SymlinksEntry == &(DeviceInformation->SymbolicLinksListHead)) { - break; + return STATUS_NOT_FOUND; } /* It doesn't have associated device, go to fallback method */

1 0

[reactos] 01/01: [NTOS:MM] Fix more 64 bit arithmetics
by Jérôme Gardou 15 Dec '20

15 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96ae15ac4bfa3c43fe08a… commit 96ae15ac4bfa3c43fe08aa959f58fd8a1449e8e0 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Dec 15 10:07:27 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Dec 15 10:08:25 2020 +0100 [NTOS:MM] Fix more 64 bit arithmetics --- ntoskrnl/mm/ARM3/section.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c index 347f3ca4074..02ead9a70a5 100644 --- a/ntoskrnl/mm/ARM3/section.c +++ b/ntoskrnl/mm/ARM3/section.c @@ -1299,6 +1299,14 @@ MiMapViewOfDataSection(IN PCONTROL_AREA ControlArea, { /* The caller did not, so pick a 64K aligned view size based on the offset */ SectionOffset->LowPart &= ~(_64K - 1); + + /* Make sure that we will not overflow */ + if ((Section->SizeOfSection.QuadPart - SectionOffset->QuadPart) > MAXLONG_PTR) + { + MiDereferenceControlArea(ControlArea); + return STATUS_INVALID_VIEW_SIZE; + } + *ViewSize = (SIZE_T)(Section->SizeOfSection.QuadPart - SectionOffset->QuadPart); } else @@ -1306,6 +1314,13 @@ MiMapViewOfDataSection(IN PCONTROL_AREA ControlArea, /* A size was specified, align it to a 64K boundary */ *ViewSize += SectionOffset->LowPart & (_64K - 1); + /* Check for overflow or huge value */ + if ((*ViewSize < (SectionOffset->LowPart & (_64K - 1))) || ((*ViewSize) > MAXLONG_PTR)) + { + MiDereferenceControlArea(ControlArea); + return STATUS_INVALID_VIEW_SIZE; + } + /* Align the offset as well to make this an aligned map */ SectionOffset->LowPart &= ~((ULONG)_64K - 1); } @@ -1313,13 +1328,6 @@ MiMapViewOfDataSection(IN PCONTROL_AREA ControlArea, /* We must be dealing with a 64KB aligned offset. This is a Windows ASSERT */ ASSERT((SectionOffset->LowPart & ((ULONG)_64K - 1)) == 0); - /* It's illegal to try to map more than overflows a LONG_PTR */ - if (*ViewSize >= MAXLONG_PTR) - { - MiDereferenceControlArea(ControlArea); - return STATUS_INVALID_VIEW_SIZE; - } - /* Windows ASSERTs for this flag */ ASSERT(ControlArea->u.Flags.GlobalOnlyPerSession == 0); @@ -1535,7 +1543,10 @@ MiCreatePagingFileMap(OUT PSEGMENT *Segment, SizeLimit <<= PAGE_SHIFT; /* Fail if this size is too big */ - if (MaximumSize->QuadPart > SizeLimit) return STATUS_SECTION_TOO_BIG; + if (MaximumSize->QuadPart > SizeLimit) + { + return STATUS_SECTION_TOO_BIG; + } /* Calculate how many Prototype PTEs will be needed */ PteCount = (PFN_COUNT)((MaximumSize->QuadPart + PAGE_SIZE - 1) >> PAGE_SHIFT); @@ -1592,7 +1603,7 @@ MiCreatePagingFileMap(OUT PSEGMENT *Segment, /* Save some extra accounting data for the segment as well */ NewSegment->u1.CreatingProcess = PsGetCurrentProcess(); - NewSegment->SizeOfSegment = PteCount * PAGE_SIZE; + NewSegment->SizeOfSegment = ((ULONGLONG)PteCount) * PAGE_SIZE; NewSegment->TotalNumberOfPtes = PteCount; NewSegment->NonExtendedPtes = PteCount;

1 0

[reactos] 01/01: [CMAKE] Fix RUNTIME_CHECKS dependent option
by Victor Perevertkin 14 Dec '20

14 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6bab72f69aecf2fed8b5e… commit 6bab72f69aecf2fed8b5e9ca61baf6499eeedb73 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Dec 14 21:09:14 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Dec 14 21:09:14 2020 +0300 [CMAKE] Fix RUNTIME_CHECKS dependent option Addendum to 92dfec219d8c53a84c68ca069abbc170fc8bdb49 and a2a6038e562e1936d737bac6cb623cbd74b0f1e2 --- sdk/cmake/config-amd64.cmake | 2 +- sdk/cmake/config-arm.cmake | 2 +- sdk/cmake/config.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/cmake/config-amd64.cmake b/sdk/cmake/config-amd64.cmake index 46a9293d2eb..f99fe6a925f 100644 --- a/sdk/cmake/config-amd64.cmake +++ b/sdk/cmake/config-amd64.cmake @@ -46,5 +46,5 @@ set(_PREFAST_ FALSE CACHE BOOL "Whether to enable PREFAST while compiling.") # RTC are incompatible with compiler optimizations. cmake_dependent_option(RUNTIME_CHECKS "Whether to enable runtime checks on MSVC" ON - "CMAKE_BUILD_TYPE STREQUAL \"Debug\"" OFF) + "CMAKE_BUILD_TYPE STREQUAL Debug" OFF) endif() diff --git a/sdk/cmake/config-arm.cmake b/sdk/cmake/config-arm.cmake index 3290d76a166..2fd55a21453 100644 --- a/sdk/cmake/config-arm.cmake +++ b/sdk/cmake/config-arm.cmake @@ -47,5 +47,5 @@ set(NEWSPRINTF FALSE CACHE BOOL if(MSVC) # RTC are incompatible with compiler optimizations. cmake_dependent_option(RUNTIME_CHECKS "Whether to enable runtime checks on MSVC" ON - "CMAKE_BUILD_TYPE STREQUAL \"Debug\"" OFF) + "CMAKE_BUILD_TYPE STREQUAL Debug" OFF) endif() diff --git a/sdk/cmake/config.cmake b/sdk/cmake/config.cmake index 37a6f949901..255e6502fe1 100644 --- a/sdk/cmake/config.cmake +++ b/sdk/cmake/config.cmake @@ -90,7 +90,7 @@ set(_VS_ANALYZE_ FALSE CACHE BOOL "Whether to enable static analysis while compiling.") # RTC are incompatible with compiler optimizations. cmake_dependent_option(RUNTIME_CHECKS "Whether to enable runtime checks on MSVC" ON - "CMAKE_BUILD_TYPE STREQUAL \"Debug\"" OFF) + "CMAKE_BUILD_TYPE STREQUAL Debug" OFF) endif() if(GCC)

1 0

[reactos] 03/03: [NTOS:MM] Fix passing section size to MiCreatePagingFileMap & fix maximum size check
by Jérôme Gardou 14 Dec '20

14 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abcbd44641cc7156bf030… commit abcbd44641cc7156bf03098f5f23c7107ff6bf20 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Dec 14 18:19:28 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Mon Dec 14 18:22:18 2020 +0100 [NTOS:MM] Fix passing section size to MiCreatePagingFileMap & fix maximum size check Also return the right status instead of stupidly asserting when failing to allocate memory. --- ntoskrnl/mm/ARM3/section.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c index 7d4e45c4af8..347f3ca4074 100644 --- a/ntoskrnl/mm/ARM3/section.c +++ b/ntoskrnl/mm/ARM3/section.c @@ -1505,14 +1505,15 @@ MiCreateDataFileMap(IN PFILE_OBJECT File, return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS NTAPI MiCreatePagingFileMap(OUT PSEGMENT *Segment, - IN PSIZE_T MaximumSize, + IN PLARGE_INTEGER MaximumSize, IN ULONG ProtectionMask, IN ULONG AllocationAttributes) { - SIZE_T SizeLimit; + ULONGLONG SizeLimit; PFN_COUNT PteCount; PMMPTE PointerPte; MMPTE TempPte; @@ -1525,18 +1526,19 @@ MiCreatePagingFileMap(OUT PSEGMENT *Segment, ASSERT((AllocationAttributes & SEC_LARGE_PAGES) == 0); /* Pagefile-backed sections need a known size */ - if (!(*MaximumSize)) return STATUS_INVALID_PARAMETER_4; + if (!MaximumSize || !MaximumSize->QuadPart || MaximumSize->QuadPart < 0) + return STATUS_INVALID_PARAMETER_4; /* Calculate the maximum size possible, given the Prototype PTEs we'll need */ - SizeLimit = MAXULONG_PTR - sizeof(SEGMENT); + SizeLimit = MmSizeOfPagedPoolInBytes - sizeof(SEGMENT); SizeLimit /= sizeof(MMPTE); SizeLimit <<= PAGE_SHIFT; /* Fail if this size is too big */ - if (*MaximumSize > SizeLimit) return STATUS_SECTION_TOO_BIG; + if (MaximumSize->QuadPart > SizeLimit) return STATUS_SECTION_TOO_BIG; /* Calculate how many Prototype PTEs will be needed */ - PteCount = (PFN_COUNT)((*MaximumSize + PAGE_SIZE - 1) >> PAGE_SHIFT); + PteCount = (PFN_COUNT)((MaximumSize->QuadPart + PAGE_SIZE - 1) >> PAGE_SHIFT); /* For commited memory, we must have a valid protection mask */ if (AllocationAttributes & SEC_COMMIT) ASSERT(ProtectionMask != 0); @@ -1546,14 +1548,21 @@ MiCreatePagingFileMap(OUT PSEGMENT *Segment, sizeof(SEGMENT) + sizeof(MMPTE) * (PteCount - 1), 'tSmM'); - ASSERT(NewSegment); + if (!NewSegment) + { + return STATUS_INSUFFICIENT_RESOURCES; + } *Segment = NewSegment; /* Now allocate the control area, which has the subsection structure */ ControlArea = ExAllocatePoolWithTag(NonPagedPool, sizeof(CONTROL_AREA) + sizeof(SUBSECTION), 'tCmM'); - ASSERT(ControlArea); + if (!ControlArea) + { + ExFreePoolWithTag(Segment, 'tSmM'); + return STATUS_INSUFFICIENT_RESOURCES; + } /* And zero it out, filling the basic segmnet pointer and reference fields */ RtlZeroMemory(ControlArea, sizeof(CONTROL_AREA) + sizeof(SUBSECTION)); @@ -2611,7 +2620,7 @@ MmCreateArm3Section(OUT PVOID *SectionObject, /* So this must be a pagefile-backed section, create the mappings needed */ Status = MiCreatePagingFileMap(&NewSegment, - (PSIZE_T)InputMaximumSize, + InputMaximumSize, ProtectionMask, AllocationAttributes); if (!NT_SUCCESS(Status)) return Status;

1 0

[reactos] 02/03: [APITESTS] Do not compile SEH tests in when using dummy PSEH
by Jérôme Gardou 14 Dec '20

14 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb196d1e3975ab44a7872… commit cb196d1e3975ab44a7872da84f03ebe9e87cb420 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Dec 14 18:21:35 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Mon Dec 14 18:22:07 2020 +0100 [APITESTS] Do not compile SEH tests in when using dummy PSEH --- modules/rostests/apitests/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt index 18e4a148a28..7c1ff8120ed 100644 --- a/modules/rostests/apitests/CMakeLists.txt +++ b/modules/rostests/apitests/CMakeLists.txt @@ -13,7 +13,9 @@ add_subdirectory(browseui) add_subdirectory(cmd) add_subdirectory(com) add_subdirectory(comctl32) -add_subdirectory(compiler) +if (NOT USE_DUMMY_PSEH) + add_subdirectory(compiler) +endif() add_subdirectory(crt) add_subdirectory(dbghelp) add_subdirectory(dciman32)

1 0

[reactos] 01/03: [PSDK] define __analysis_noreturn for clang static analyzer
by Jérôme Gardou 14 Dec '20

14 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=003ad0ec07854b8056894… commit 003ad0ec07854b8056894d0d7bd3267d20e7dc50 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Dec 11 13:11:03 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Mon Dec 14 18:22:07 2020 +0100 [PSDK] define __analysis_noreturn for clang static analyzer --- sdk/include/psdk/specstrings.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sdk/include/psdk/specstrings.h b/sdk/include/psdk/specstrings.h index e2d4cc31538..7bff194e184 100644 --- a/sdk/include/psdk/specstrings.h +++ b/sdk/include/psdk/specstrings.h @@ -7,7 +7,7 @@ */ // // Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. // @@ -258,7 +258,11 @@ __ANNOTATION(SAL_failureDefault(enum __SAL_failureKind)); #define __class_code_content(typ) #define __analysis_assert(e) #define __analysis_hint(hint) +#ifndef __clang__ #define __analysis_noreturn +#else +#define __analysis_noreturn __attribute__((analyzer_noreturn)) +#endif /* Internal defintions */ #define __inner_data_source(src_raw) #define __inner_this_data_source(src_raw) @@ -429,7 +433,7 @@ __inner_analysis_assume_nullterminated_dec // A common pattern is to pass an "_Inout_ PCHAR* ppBuf" of size "_Inout_ DWORD* pSize" // to a function that writes to **pBuf, incrementing *ppBuf to point to one // past the last written byte. Thus the length of the write is -// (*ppBuf - Old(*ppBuf)). The size of the remaining unwritten capacity +// (*ppBuf - Old(*ppBuf)). The size of the remaining unwritten capacity // is written to *pSize. // // This pattern is frequently used when progressively filling a @@ -471,7 +475,7 @@ __inner_analysis_assume_nullterminated_dec // completely accurate approximation, but reasonable. // #define _Post_equals_last_error_ _Post_satisfies_(_Curr_ != 0) - + #ifdef __cplusplus } #endif @@ -533,7 +537,7 @@ void __pfx_assume(int, const char *); as VS11 is the minimum required for SAL 2 support. If we are in a downlevel environment, we can go ahead and include no_sal2.h - to make all of SAL 2 no-ops to ensure no build failures. + to make all of SAL 2 no-ops to ensure no build failures. */ #if (!defined(_Outptr_) /* || _MSC_VER <= 1600 */) && !( defined( MIDL_PASS ) || defined(__midl) || defined(RC_INVOKED) ) && !( defined( _SDV_ ) ) /*IFSTRIP=IGN*/ #include <no_sal2.h>

1 0

[reactos] 01/01: [SCSIPORT] Append the missing "SCSI <device type> Device" string to the device description
by Eric Kohl 13 Dec '20

13 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f095ff418b3279a761278… commit f095ff418b3279a7612789aca053ac1096b77c0a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 13 16:24:58 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 13 16:24:58 2020 +0100 [SCSIPORT] Append the missing "SCSI <device type> Device" string to the device description --- drivers/storage/port/scsiport/pdo.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/storage/port/scsiport/pdo.c b/drivers/storage/port/scsiport/pdo.c index 09c4249d37c..3f2bd697309 100644 --- a/drivers/storage/port/scsiport/pdo.c +++ b/drivers/storage/port/scsiport/pdo.c @@ -173,7 +173,7 @@ PdoHandleQueryDeviceText( PIO_STACK_LOCATION IoStack; UINT32 Offset = 0; PINQUIRYDATA InquiryData; - CHAR LocalBuffer[40]; + CHAR LocalBuffer[64]; ANSI_STRING AnsiString; UNICODE_STRING DeviceDescription; @@ -200,6 +200,9 @@ PdoHandleQueryDeviceText( sizeof(InquiryData->ProductId), ' ', TRUE); + Offset += sprintf(&LocalBuffer[Offset], + " SCSI %s Device", + GetDeviceType(InquiryData)); LocalBuffer[Offset++] = '\0'; RtlInitAnsiString(&AnsiString, (PCSZ)&LocalBuffer);

1 0

[reactos] 01/01: [INF] Include volume.inf in the build
by Eric Kohl 13 Dec '20

13 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b71df062110887a7ca423… commit b71df062110887a7ca423db317079f46c9184026 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 13 01:22:52 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 13 01:22:52 2020 +0100 [INF] Include volume.inf in the build --- media/inf/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/media/inf/CMakeLists.txt b/media/inf/CMakeLists.txt index ba9f1fcdc0c..92be65db3f6 100644 --- a/media/inf/CMakeLists.txt +++ b/media/inf/CMakeLists.txt @@ -26,6 +26,7 @@ list(APPEND INF_FILES unknown.inf usb.inf usbport.inf + volume.inf wdmaudio.inf wmiacpi.inf)

1 0

[reactos] 01/01: [INF] Add an inf file for the volume device class
by Eric Kohl 13 Dec '20

13 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb500b884a083ca5a30c1… commit fb500b884a083ca5a30c19c2673f74df5e7f7f2d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 13 01:21:22 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 13 01:21:22 2020 +0100 [INF] Add an inf file for the volume device class --- media/inf/syssetup.inf | 1 + media/inf/volume.inf | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/media/inf/syssetup.inf b/media/inf/syssetup.inf index 0de1dc980ca..d80ab26d629 100644 --- a/media/inf/syssetup.inf +++ b/media/inf/syssetup.inf @@ -24,6 +24,7 @@ ports.inf scsi.inf unknown.inf usbport.inf +volume.inf audio.inf ks.inf c_image.inf diff --git a/media/inf/volume.inf b/media/inf/volume.inf new file mode 100644 index 00000000000..69a0b59aee4 --- /dev/null +++ b/media/inf/volume.inf @@ -0,0 +1,45 @@ +; Volume.INF + +; Installation file for storage volumes + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = Volume +ClassGUID = {71A27CDD-812A-11D0-BEC7-08002BE2092F} +Provider = %ReactOS% +DriverVer = 09/10/2008,1.0.0.0 + +[DestinationDirs] +DefaultDestDir = 12 + +[ClassInstall32.NT] +AddReg = Volume.NT.AddReg + +[Volume.NT.AddReg] +HKR, , , 0, %VolumeClassName% +HKR, , EnumPropPages32, 0, "storprop.dll,VolumePropPageProvider" +HKR, , Icon, 0, "-53" +HKR, , Installer32, 0, "syssetup.dll,VolumeClassInstaller" +HKR, , NoInstallClass, 0, "1" +HKR, , SilentInstall, 0, "1" + +[Manufacturer] +%GenericMfg% = GenericMfg + +[GenericMfg] +%STORAGE\Volume.DeviceDesc% = VolumeInstall,STORAGE\Volume + +[VolumeInstall] + +[VolumeInstall.Interfaces] +AddInterface = {53F5630D-B6BF-11D0-94F2-00A0C91EFb8B} + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" +VolumeClassName = "Storage volumes" +GenericMfg = "(Generic storage volumes)" +STORAGE\Volume.DeviceDesc = "Storage volume" \ No newline at end of file

1 0

[reactos] 01/01: [STORPROP] Add missing property provider stubs
by Eric Kohl 12 Dec '20

12 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afbff37d9860461fea772… commit afbff37d9860461fea7721a7244376e65972e790 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Dec 12 16:42:15 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Dec 12 16:42:15 2020 +0100 [STORPROP] Add missing property provider stubs --- dll/win32/storprop/storprop.c | 56 ++++++++++++++++++++++++++++++++++++++++ dll/win32/storprop/storprop.spec | 6 ++--- 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dll/win32/storprop/storprop.c b/dll/win32/storprop/storprop.c index ba37599da96..7a07a3bff82 100644 --- a/dll/win32/storprop/storprop.c +++ b/dll/win32/storprop/storprop.c @@ -19,6 +19,9 @@ HINSTANCE hInstance = NULL; +/* + * @unimplemented + */ DWORD WINAPI DiskClassInstaller( @@ -29,9 +32,17 @@ DiskClassInstaller( DPRINT("DiskClassInstaller(%u %p %p)\n", InstallFunction, DeviceInfoSet, DeviceInfoData); + if (InstallFunction == DIF_ADDPROPERTYPAGE_ADVANCED) + { + return ERROR_SUCCESS; + } + return ERROR_DI_DO_DEFAULT; } +/* + * @unimplemented + */ DWORD WINAPI DvdClassInstaller( @@ -45,6 +56,51 @@ DvdClassInstaller( return ERROR_DI_DO_DEFAULT; } +/* + * @unimplemented + */ +BOOL +WINAPI +DvdPropPageProvider( + _In_ PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, + _In_ LPFNADDPROPSHEETPAGE lpfnAddPropSheetPageProc, + _In_ LPARAM lParam) +{ + DPRINT("DvdPropPageProvider(%p %p %lx)\n", + lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +IdePropPageProvider( + _In_ PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, + _In_ LPFNADDPROPSHEETPAGE lpfnAddPropSheetPageProc, + _In_ LPARAM lParam) +{ + DPRINT("IdePropPageProvider(%p %p %lx)\n", + lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); + return FALSE; +} + +/* + * @implemented + */ +BOOL +WINAPI +VolumePropPageProvider( + _In_ PSP_PROPSHEETPAGE_REQUEST lpPropSheetPageRequest, + _In_ LPFNADDPROPSHEETPAGE lpfnAddPropSheetPageProc, + _In_ LPARAM lParam) +{ + DPRINT("VolumePropPageProvider(%p %p %lx)\n", + lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); + return FALSE; +} + BOOL WINAPI DllMain( diff --git a/dll/win32/storprop/storprop.spec b/dll/win32/storprop/storprop.spec index d096e6b78e8..f0d37a3bb16 100644 --- a/dll/win32/storprop/storprop.spec +++ b/dll/win32/storprop/storprop.spec @@ -5,6 +5,6 @@ @ stdcall DllMain(ptr long ptr) @ stdcall DvdClassInstaller(long ptr ptr) @ stub DvdLauncher -@ stub DvdPropPageProvider -@ stub IdePropPageProvider -@ stub VolumePropPageProvider +@ stdcall DvdPropPageProvider(ptr ptr long) +@ stdcall IdePropPageProvider(ptr ptr long) +@ stdcall VolumePropPageProvider(ptr ptr long)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs