Ros-diffs April 2022

ros-diffs@reactos.org

22 participants
157 discussions

[reactos] 02/03: [BOOTDATA][FS] Small adjustments of filesystem drivers registry parameters.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c032f3fc94ec9f4d1fd4… commit 2c032f3fc94ec9f4d1fd4c1d3570c33a1707cb5b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 29 04:01:55 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Apr 18 02:40:33 2022 +0200 [BOOTDATA][FS] Small adjustments of filesystem drivers registry parameters. - Fix the ErrorControl values to 1 (SERVICE_ERROR_NORMAL). - Fix RamDisk driver type (it's SERVICE_KERNEL_DRIVER, not FS). - btrfs.inf : This is a filesystem driver, so fix its ServiceType. - Move 3rd-party FS data (btrfs, ext2, nfs(d)) from the system hivesys.inf and into their dedicated **.reg.inf files. --- base/services/nfsd/CMakeLists.txt | 2 ++ base/services/nfsd/nfsd_reg.inf | 8 ++++++ boot/bootdata/hivesys.inf | 46 +++----------------------------- drivers/filesystems/btrfs/CMakeLists.txt | 2 ++ drivers/filesystems/btrfs/btrfs.inf | 2 +- drivers/filesystems/btrfs/btrfs_reg.inf | 7 +++++ drivers/filesystems/cdfs/CMakeLists.txt | 1 + drivers/filesystems/cdfs/cdfs_reg.inf | 5 ++-- drivers/filesystems/ext2/CMakeLists.txt | 1 + drivers/filesystems/ext2/ext2fs_reg.inf | 4 +-- drivers/filesystems/msfs/msfs_reg.inf | 5 ++-- drivers/filesystems/nfs/CMakeLists.txt | 1 + drivers/filesystems/nfs/nfs41_reg.inf | 10 +++++++ drivers/filesystems/npfs/npfs_reg.inf | 5 ++-- drivers/filesystems/udfs/udfs_reg.inf | 4 +-- 15 files changed, 50 insertions(+), 53 deletions(-) diff --git a/base/services/nfsd/CMakeLists.txt b/base/services/nfsd/CMakeLists.txt index fdb6f81857a..6a96dd66c80 100644 --- a/base/services/nfsd/CMakeLists.txt +++ b/base/services/nfsd/CMakeLists.txt @@ -59,6 +59,8 @@ endif() set_module_type(nfsd win32cui) add_importlibs(nfsd advapi32 iphlpapi kernel32_vista libtirpc msvcrt shell32 ws2_32 wldap32 kernel32 ntdll) add_pch(nfsd precomp.h SOURCE) + add_cd_file(TARGET nfsd DESTINATION reactos/system32 FOR all) add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/netconfig" DESTINATION reactos/system32/drivers/etc FOR all) add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ms-nfs41-idmap.conf" DESTINATION reactos/system32/drivers/etc FOR all) +add_registry_inf(nfsd_reg.inf) diff --git a/base/services/nfsd/nfsd_reg.inf b/base/services/nfsd/nfsd_reg.inf new file mode 100644 index 00000000000..8d2bb10315f --- /dev/null +++ b/base/services/nfsd/nfsd_reg.inf @@ -0,0 +1,8 @@ +; NFS daemon +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","DisplayName",0x00000000,"NFSv4.1 Client" +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","ImagePath",0x00020000,"%SystemRoot%\system32\nfsd.exe --noldap" +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","Type",0x00010001,0x00000010 diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 2486a3f551c..507f09cc7c5 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1705,7 +1705,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","Type",0x00010001,0x00000020 ; NTFS filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ImagePath",0x00020000,"system32\drivers\ntfs.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000003 @@ -2180,55 +2180,17 @@ HKLM,"SYSTEM\CurrentControlSet\Services\DcomLaunch\Parameters","ServiceDll",0x00 ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Type",0x00010001,0x00000001 ; Virtual FAT filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Group",0x00000000,"Boot File System" HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","ImagePath",0x00020000,"system32\drivers\fastfat.sys" HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Type",0x00010001,0x00000002 ; RAM Disk class driver -HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","ImagePath",0x00020000,"system32\drivers\ramdisk.sys" HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","Type",0x00010001,0x00000002 - -; EXT2 Filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Group",0x00000000,"Boot File System" -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ImagePath",0x00020000,"system32\drivers\ext2fs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Type",0x00010001,0x00000002 -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","CodePage",0x00000000,"default" -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","WritingSupport",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","CheckingBitmap",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","Ext3ForceWriting",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","AutoMount",0x00010001,0x00000001 - -; BTRFS Filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","Group",0x00000000,"Boot File System" -HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","ImagePath",0x00020000,"system32\drivers\btrfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","Type",0x00010001,0x00000002 - -; NFS Filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","Group",0x00000000,"Network" -HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","ImagePath",0x00020000,"system32\drivers\nfs41_driver.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","Type",0x00010001,0x00000002 -HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider","DeviceName",0x00000000,\Device\nfs41_driver -HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider","Name",0x00000000,"NFS41 Network" -HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider","ProviderPath",0x00000000,System32\nfs41_np.dll - -; NFS daemon -HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","DisplayName",0x00000000,"NFSv4.1 Client" -HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","ImagePath",0x00020000,"%SystemRoot%\system32\nfsd.exe --noldap" -HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","Type",0x00010001,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","Type",0x00010001,0x00000001 ; Filesystem Filter Manager driver HKLM,"SYSTEM\CurrentControlSet\Services\fltmgr","ErrorControl",0x00010001,0x00000003 diff --git a/drivers/filesystems/btrfs/CMakeLists.txt b/drivers/filesystems/btrfs/CMakeLists.txt index e7427fd8e4a..b86b210542e 100644 --- a/drivers/filesystems/btrfs/CMakeLists.txt +++ b/drivers/filesystems/btrfs/CMakeLists.txt @@ -74,5 +74,7 @@ add_definitions(-D__KERNEL__) set_module_type(btrfs kernelmodedriver) target_link_libraries(btrfs rtlver zlib_solo chkstk wdmguid ${PSEH_LIB}) add_importlibs(btrfs ntoskrnl hal) + add_cd_file(TARGET btrfs DESTINATION reactos/system32/drivers NO_CAB FOR all) add_driver_inf(btrfs btrfs.inf) +add_registry_inf(btrfs_reg.inf) diff --git a/drivers/filesystems/btrfs/btrfs.inf b/drivers/filesystems/btrfs/btrfs.inf index fa841e227f2..08ef7f9106a 100644 --- a/drivers/filesystems/btrfs/btrfs.inf +++ b/drivers/filesystems/btrfs/btrfs.inf @@ -77,7 +77,7 @@ DelService = %ServiceName%,0x200 ;Ensure service is stopped before deleting DisplayName = %ServiceName% Description = %ServiceDescription% ServiceBinary = %12%\%DriverName%.sys ;%windir%\system32\drivers\ -ServiceType = 1 +ServiceType = 2 StartType = 1 ;SERVICE_SYSTEM_START ErrorControl = 1 LoadOrderGroup = "File System" diff --git a/drivers/filesystems/btrfs/btrfs_reg.inf b/drivers/filesystems/btrfs/btrfs_reg.inf new file mode 100644 index 00000000000..ec4ac369b27 --- /dev/null +++ b/drivers/filesystems/btrfs/btrfs_reg.inf @@ -0,0 +1,7 @@ +; BTRFS Filesystem driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","ImagePath",0x00020000,"system32\drivers\btrfs.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","Type",0x00010001,0x00000002 diff --git a/drivers/filesystems/cdfs/CMakeLists.txt b/drivers/filesystems/cdfs/CMakeLists.txt index 552224c2058..f85cfea326f 100644 --- a/drivers/filesystems/cdfs/CMakeLists.txt +++ b/drivers/filesystems/cdfs/CMakeLists.txt @@ -37,5 +37,6 @@ set_module_type(cdfs kernelmodedriver) target_link_libraries(cdfs ${PSEH_LIB} memcmp) add_importlibs(cdfs ntoskrnl hal) set_property(TARGET cdfs PROPERTY C_STANDARD 90) + add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB FOR all) add_registry_inf(cdfs_reg.inf) diff --git a/drivers/filesystems/cdfs/cdfs_reg.inf b/drivers/filesystems/cdfs/cdfs_reg.inf index 9ae7413c613..f8d685ea3ec 100644 --- a/drivers/filesystems/cdfs/cdfs_reg.inf +++ b/drivers/filesystems/cdfs/cdfs_reg.inf @@ -1,6 +1,7 @@ -; Cdfs (ISO96660) filesystem driver +; Cdfs (ISO96660) Filesystem driver [AddReg] -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","DependOnGroup",0x00010000,"SCSI CDROM Class" +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ImagePath",0x00020000,"system32\drivers\cdfs.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000003 diff --git a/drivers/filesystems/ext2/CMakeLists.txt b/drivers/filesystems/ext2/CMakeLists.txt index 005bfcb6dac..e07135b419d 100644 --- a/drivers/filesystems/ext2/CMakeLists.txt +++ b/drivers/filesystems/ext2/CMakeLists.txt @@ -120,3 +120,4 @@ set_property(TARGET ext2fs PROPERTY C_STANDARD 90) add_pch(ext2fs inc/ext2fs.h SOURCE) add_cd_file(TARGET ext2fs DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(ext2fs_reg.inf) diff --git a/drivers/filesystems/ext2/ext2fs_reg.inf b/drivers/filesystems/ext2/ext2fs_reg.inf index dfea9e0d515..5857076551c 100644 --- a/drivers/filesystems/ext2/ext2fs_reg.inf +++ b/drivers/filesystems/ext2/ext2fs_reg.inf @@ -1,6 +1,6 @@ -; ext2/3/4 filesystem driver +; ext2/3/4 Filesystem driver [AddReg] -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Group",0x00000000,"Boot File System" HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ImagePath",0x00020000,"system32\drivers\ext2fs.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000003 diff --git a/drivers/filesystems/msfs/msfs_reg.inf b/drivers/filesystems/msfs/msfs_reg.inf index 482f0ecaeed..c1e68d72af7 100644 --- a/drivers/filesystems/msfs/msfs_reg.inf +++ b/drivers/filesystems/msfs/msfs_reg.inf @@ -1,5 +1,6 @@ -; Mailslot filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ErrorControl",0x00010001,0x00000000 +; Mailslot Filesystem driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ImagePath",0x00020000,"system32\drivers\msfs.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Start",0x00010001,0x00000001 diff --git a/drivers/filesystems/nfs/CMakeLists.txt b/drivers/filesystems/nfs/CMakeLists.txt index 91ad25761d0..10b71000757 100644 --- a/drivers/filesystems/nfs/CMakeLists.txt +++ b/drivers/filesystems/nfs/CMakeLists.txt @@ -23,3 +23,4 @@ endif() set_property(TARGET nfs41_driver PROPERTY C_STANDARD 90) add_cd_file(TARGET nfs41_driver DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(nfs41_reg.inf) diff --git a/drivers/filesystems/nfs/nfs41_reg.inf b/drivers/filesystems/nfs/nfs41_reg.inf new file mode 100644 index 00000000000..1d91282e908 --- /dev/null +++ b/drivers/filesystems/nfs/nfs41_reg.inf @@ -0,0 +1,10 @@ +; NFS Filesystem driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","Group",0x00000000,"Network" +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","ImagePath",0x00020000,"system32\drivers\nfs41_driver.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","Type",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider","DeviceName",0x00000000,\Device\nfs41_driver +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider","Name",0x00000000,"NFS41 Network" +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider","ProviderPath",0x00000000,System32\nfs41_np.dll diff --git a/drivers/filesystems/npfs/npfs_reg.inf b/drivers/filesystems/npfs/npfs_reg.inf index aff93e18320..77ee7a00bd7 100644 --- a/drivers/filesystems/npfs/npfs_reg.inf +++ b/drivers/filesystems/npfs/npfs_reg.inf @@ -1,5 +1,6 @@ -; Named Pipe filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001,0x00000000 +; Named Pipe Filesystem driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ImagePath",0x00020000,"system32\drivers\npfs.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Start",0x00010001,0x00000001 diff --git a/drivers/filesystems/udfs/udfs_reg.inf b/drivers/filesystems/udfs/udfs_reg.inf index 94f378729ed..bb289578eb5 100644 --- a/drivers/filesystems/udfs/udfs_reg.inf +++ b/drivers/filesystems/udfs/udfs_reg.inf @@ -1,6 +1,6 @@ -; UDF filesystem driver +; UDF Filesystem driver [AddReg] -HKLM,"SYSTEM\CurrentControlSet\Services\Udfs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Udfs","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Udfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Udfs","ImagePath",0x00020000,"system32\drivers\udfs.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Udfs","Start",0x00010001,0x00000003

2 years, 8 months

[reactos] 01/03: [KERNEL32] Improve annotation of BaseProcess/ThreadStartup(); remove useless cast; fix PPROCESS_START_ROUTINE return type.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75e2fb4566b7d01437992… commit 75e2fb4566b7d0143799254fe1ef9a787b9bcc1d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Apr 18 01:20:22 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Apr 18 02:40:32 2022 +0200 [KERNEL32] Improve annotation of BaseProcess/ThreadStartup(); remove useless cast; fix PPROCESS_START_ROUTINE return type. --- dll/win32/kernel32/client/proc.c | 6 +++--- dll/win32/kernel32/client/thread.c | 9 +++++---- dll/win32/kernel32/include/kernel32.h | 15 +++++++++------ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index 3b7d6f05ec5..a659101137a 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -445,12 +445,12 @@ BasepSxsCloseHandles(IN PBASE_MSG_SXS_HANDLES Handles) } } +DECLSPEC_NORETURN VOID WINAPI -BaseProcessStartup(PPROCESS_START_ROUTINE lpStartAddress) +BaseProcessStartup( + _In_ PPROCESS_START_ROUTINE lpStartAddress) { - DPRINT("BaseProcessStartup(..) - setting up exception frame.\n"); - _SEH2_TRY { /* Set our Start Address */ diff --git a/dll/win32/kernel32/client/thread.c b/dll/win32/kernel32/client/thread.c index 6d31a1b394d..0df088d510e 100644 --- a/dll/win32/kernel32/client/thread.c +++ b/dll/win32/kernel32/client/thread.c @@ -50,11 +50,12 @@ BasepNotifyCsrOfThread(IN HANDLE ThreadHandle, return STATUS_SUCCESS; } -__declspec(noreturn) +DECLSPEC_NORETURN VOID WINAPI -BaseThreadStartup(IN LPTHREAD_START_ROUTINE lpStartAddress, - IN LPVOID lpParameter) +BaseThreadStartup( + _In_ LPTHREAD_START_ROUTINE lpStartAddress, + _In_ LPVOID lpParameter) { /* Attempt to call the Thread Start Address */ _SEH2_TRY @@ -67,7 +68,7 @@ BaseThreadStartup(IN LPTHREAD_START_ROUTINE lpStartAddress, } /* Get the exit code from the Thread Start */ - ExitThread((lpStartAddress)((PVOID)lpParameter)); + ExitThread(lpStartAddress(lpParameter)); } _SEH2_EXCEPT(UnhandledExceptionFilter(_SEH2_GetExceptionInformation())) { diff --git a/dll/win32/kernel32/include/kernel32.h b/dll/win32/kernel32/include/kernel32.h index ef47d4d946c..c331e45f465 100644 --- a/dll/win32/kernel32/include/kernel32.h +++ b/dll/win32/kernel32/include/kernel32.h @@ -234,22 +234,25 @@ BasepProbeForDllManifest( OUT PVOID *ActCtx ); -__declspec(noreturn) +DECLSPEC_NORETURN VOID WINAPI -BaseThreadStartup(LPTHREAD_START_ROUTINE lpStartAddress, - LPVOID lpParameter); +BaseThreadStartup( + _In_ LPTHREAD_START_ROUTINE lpStartAddress, + _In_ LPVOID lpParameter); -__declspec(noreturn) +DECLSPEC_NORETURN VOID WINAPI BaseFiberStartup(VOID); -typedef UINT (WINAPI *PPROCESS_START_ROUTINE)(VOID); +typedef DWORD (WINAPI *PPROCESS_START_ROUTINE)(VOID); +DECLSPEC_NORETURN VOID WINAPI -BaseProcessStartup(PPROCESS_START_ROUTINE lpStartAddress); +BaseProcessStartup( + _In_ PPROCESS_START_ROUTINE lpStartAddress); PVOID WINAPI

2 years, 8 months

[reactos] 01/01: [NTUSER] Do assignment lock pti->spDefaultImc (#4456)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e138837236e9267f8abf… commit 7e138837236e9267f8abffe1342ecee0099417c2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Apr 18 08:23:18 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Apr 18 08:23:18 2022 +0900 [NTUSER] Do assignment lock pti->spDefaultImc (#4456) According to JIRA user simonelombardo, there was crash in exiting a thread. - Add UserAssignmentLock, and UserAssignmentUnlock helper functions. - Lock and unlock pti->spDefaultImc by using those helper functions. CORE-18044 --- win32ss/user/ntuser/ime.c | 4 +--- win32ss/user/ntuser/main.c | 2 ++ win32ss/user/ntuser/object.c | 36 ++++++++++++++++++++++++++++++++++++ win32ss/user/ntuser/object.h | 2 ++ 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 7b6c06b9f94..6b6e17391ef 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -1362,9 +1362,7 @@ PIMC FASTCALL UserCreateInputContext(ULONG_PTR dwClientImcData) else // First time. It's the default IMC. { // Add the first one (default) to the list. - if (pti->spDefaultImc) - UserDereferenceObject(pti->spDefaultImc); - pti->spDefaultImc = pIMC; + UserAssignmentLock((PVOID*)&pti->spDefaultImc, pIMC); pIMC->pImcNext = NULL; } diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index dfdf2d64c0b..1010d7970ef 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -696,6 +696,7 @@ error: VOID UserDisplayNotifyShutdown(PPROCESSINFO ppiCurrent); +// Win: xxxDestroyThreadInfo NTSTATUS NTAPI ExitThreadCallback(PETHREAD Thread) @@ -783,6 +784,7 @@ ExitThreadCallback(PETHREAD Thread) ASSERT(FALSE); return STATUS_UNSUCCESSFUL; } + UserAssignmentUnlock((PVOID*)&ptiCurrent->spDefaultImc); if (ppiCurrent && ppiCurrent->ptiList == ptiCurrent && !ptiCurrent->ptiSibling && ppiCurrent->W32PF_flags & W32PF_CLASSESREGISTERED) diff --git a/win32ss/user/ntuser/object.c b/win32ss/user/ntuser/object.c index cc2bebdb8bc..492d4ab2b6b 100644 --- a/win32ss/user/ntuser/object.c +++ b/win32ss/user/ntuser/object.c @@ -801,3 +801,39 @@ CLEANUP: UserLeave(); END_CLEANUP; } + +// Win: HMAssignmentLock +PVOID FASTCALL UserAssignmentLock(PVOID *ppvObj, PVOID pvNew) +{ + PVOID pvOld = *ppvObj; + *ppvObj = pvNew; + + if (pvOld && pvOld == pvNew) + return pvOld; + + if (pvNew) + UserReferenceObject(pvNew); + + if (pvOld) + { + if (UserDereferenceObject(pvOld)) + pvOld = NULL; + } + + return pvOld; +} + +// Win: HMAssignmentUnlock +PVOID FASTCALL UserAssignmentUnlock(PVOID *ppvObj) +{ + PVOID pvOld = *ppvObj; + *ppvObj = NULL; + + if (pvOld) + { + if (UserDereferenceObject(pvOld)) + pvOld = NULL; + } + + return pvOld; +} diff --git a/win32ss/user/ntuser/object.h b/win32ss/user/ntuser/object.h index 9fb1b7f6637..0d6bc6dda88 100644 --- a/win32ss/user/ntuser/object.h +++ b/win32ss/user/ntuser/object.h @@ -20,6 +20,8 @@ void DbgUserDumpHandleTable(); PVOID FASTCALL ValidateHandle(HANDLE handle, HANDLE_TYPE type); BOOLEAN UserDestroyObjectsForOwner(PUSER_HANDLE_TABLE Table, PVOID Owner); BOOL FASTCALL UserMarkObjectDestroy(PVOID); +PVOID FASTCALL UserAssignmentLock(PVOID *ppvObj, PVOID pvNew); +PVOID FASTCALL UserAssignmentUnlock(PVOID *ppvObj); static __inline VOID UserRefObjectCo(PVOID obj, PUSER_REFERENCE_ENTRY UserReferenceEntry)

2 years, 8 months

[reactos] 01/01: [SETUPAPI] SetupDiCreateDeviceInfoW: Fix flags conversion for CM_Create_DevInst_ExW

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=851c5e0c3a2b6a781eda3… commit 851c5e0c3a2b6a781eda35066685dc91c168d187 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 17 23:32:01 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 17 23:32:01 2022 +0200 [SETUPAPI] SetupDiCreateDeviceInfoW: Fix flags conversion for CM_Create_DevInst_ExW --- dll/win32/setupapi/devinst.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index 065c857bb22..47e2bf8beaa 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -1583,6 +1583,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW( DEVINST RootDevInst; DEVINST DevInst; WCHAR GenInstanceId[MAX_DEVICE_ID_LEN]; + DWORD dwFlags; TRACE("%s(%p %s %s %s %p %x %p)\n", __FUNCTION__, DeviceInfoSet, debugstr_w(DeviceName), debugstr_guid(ClassGuid), debugstr_w(DeviceDescription), @@ -1632,13 +1633,15 @@ BOOL WINAPI SetupDiCreateDeviceInfoW( return FALSE; } + dwFlags = CM_CREATE_DEVINST_PHANTOM; + if (CreationFlags & DICD_GENERATE_ID) + dwFlags |= CM_CREATE_DEVINST_GENERATE_ID; + /* Create the new device instance */ cr = CM_Create_DevInst_ExW(&DevInst, (DEVINSTID)DeviceName, RootDevInst, - CM_CREATE_DEVINST_PHANTOM | - (CreationFlags & DICD_GENERATE_ID) ? - CM_CREATE_DEVINST_GENERATE_ID : 0, + dwFlags, set->hMachine); if (cr != CR_SUCCESS) {

2 years, 8 months

[reactos] 01/01: [SETUPAPI] CM_Locate_DevNode_ExW: The root device does not need to be validated

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dde7e6e25494398429cab… commit dde7e6e25494398429cab9074fd8171f8dbf8780 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 17 22:50:01 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 17 22:50:26 2022 +0200 [SETUPAPI] CM_Locate_DevNode_ExW: The root device does not need to be validated --- dll/win32/setupapi/cfgmgr.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index e411c887f75..4a4e18ad621 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -5948,6 +5948,19 @@ CM_Locate_DevNode_ExW( if (pDeviceID != NULL && lstrlenW(pDeviceID) != 0) { lstrcpyW(DeviceIdBuffer, pDeviceID); + + RpcTryExcept + { + /* Validate the device ID */ + ret = PNP_ValidateDeviceInstance(BindingHandle, + DeviceIdBuffer, + ulFlags); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; } else { @@ -5963,24 +5976,9 @@ CM_Locate_DevNode_ExW( ret = RpcStatusToCmStatus(RpcExceptionCode()); } RpcEndExcept; - - if (ret != CR_SUCCESS) - return CR_FAILURE; } - TRACE("DeviceIdBuffer: %s\n", debugstr_w(DeviceIdBuffer)); - RpcTryExcept - { - /* Validate the device ID */ - ret = PNP_ValidateDeviceInstance(BindingHandle, - DeviceIdBuffer, - ulFlags); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - ret = RpcStatusToCmStatus(RpcExceptionCode()); - } - RpcEndExcept; + TRACE("DeviceIdBuffer: %s\n", debugstr_w(DeviceIdBuffer)); if (ret == CR_SUCCESS) {

2 years, 8 months

[reactos] 01/01: [CMAKE:MSVC] Refine ASM16 ml.exe path selection. Addendum to commit 60733590.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea3e4bb4cb1f790bd3b5a… commit ea3e4bb4cb1f790bd3b5a414ab141f384a54e1ba Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 17 19:31:07 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 17 19:31:48 2022 +0200 [CMAKE:MSVC] Refine ASM16 ml.exe path selection. Addendum to commit 60733590. --- sdk/cmake/msvc.cmake | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index af021129b22..5c6492f448e 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -414,10 +414,14 @@ set(PSEH_LIB "pseh") # Use a full path for the x86 version of ml when using x64 VS. # It's not a problem when using the DDK/WDK because, in x64 mode, # both the x86 and x64 versions of ml are available. -if((ARCH STREQUAL "amd64") AND (DEFINED ENV{VCToolsInstallDir})) - set(CMAKE_ASM16_COMPILER $ENV{VCToolsInstallDir}/bin/HostX86/x86/ml.exe) -elseif((ARCH STREQUAL "amd64") AND (DEFINED ENV{VCINSTALLDIR})) - set(CMAKE_ASM16_COMPILER $ENV{VCINSTALLDIR}/bin/ml.exe) +if(ARCH STREQUAL "amd64") + if((MSVC_VERSION LESS_EQUAL 1900) AND (DEFINED ENV{VCINSTALLDIR})) + set(CMAKE_ASM16_COMPILER $ENV{VCINSTALLDIR}/bin/ml.exe) + elseif(DEFINED ENV{VCToolsInstallDir}) + set(CMAKE_ASM16_COMPILER $ENV{VCToolsInstallDir}/bin/HostX86/x86/ml.exe) + else() + set(CMAKE_ASM16_COMPILER ml.exe) + endif() elseif(ARCH STREQUAL "arm") set(CMAKE_ASM16_COMPILER armasm.exe) elseif(ARCH STREQUAL "arm64")

2 years, 8 months

[reactos] 01/01: [SDK:CMLIB][FREELDR:NTLDR] Revert commit 168fea0ee and provide a better fix. Addendum to 93d8a1b7b.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ed7d4b3414746097abe9… commit 8ed7d4b3414746097abe9b41303602515cfa97c2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 17 16:43:17 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 17 16:46:47 2022 +0200 [SDK:CMLIB][FREELDR:NTLDR] Revert commit 168fea0ee and provide a better fix. Addendum to 93d8a1b7b. Correct fix was to fix the HCELL_INDEX <-> HKEY conversions, much like is being done with UlongToHandle / HandleToUlong. The on-disk/in-memory hive file structures are platform-independent: their layout must not depend on whether code is compiled in 32 or 64 bits. --- boot/freeldr/freeldr/ntldr/registry.c | 29 +++++++++++++++++------------ boot/freeldr/freeldr/ntldr/registry.h | 2 ++ boot/freeldr/freeldr/ntldr/wlregistry.c | 4 ++-- sdk/lib/cmlib/hivedata.h | 7 +------ 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/registry.c b/boot/freeldr/freeldr/ntldr/registry.c index 566f1bfa189..adc0f9d075c 100644 --- a/boot/freeldr/freeldr/ntldr/registry.c +++ b/boot/freeldr/freeldr/ntldr/registry.c @@ -32,9 +32,14 @@ static HCELL_INDEX SystemRootCell; PHHIVE SystemHive = NULL; HKEY CurrentControlSetKey = NULL; +#define HCI_TO_HKEY(CellIndex) ((HKEY)(ULONG_PTR)(CellIndex)) +#ifndef HKEY_TO_HCI // See also registry.h +#define HKEY_TO_HCI(hKey) ((HCELL_INDEX)(ULONG_PTR)(hKey)) +#endif + #define GET_HHIVE(CmHive) (&((CmHive)->Hive)) #define GET_HHIVE_FROM_HKEY(hKey) GET_HHIVE(CmSystemHive) -#define GET_CM_KEY_NODE(hHive, hKey) ((PCM_KEY_NODE)HvGetCell(hHive, (HCELL_INDEX)hKey)) +#define GET_CM_KEY_NODE(hHive, hKey) ((PCM_KEY_NODE)HvGetCell(hHive, HKEY_TO_HCI(hKey))) PVOID NTAPI @@ -129,7 +134,7 @@ RegInitCurrentControlSet( return FALSE; } - CurrentControlSetKey = (HKEY)ControlCell; + CurrentControlSetKey = HCI_TO_HKEY(ControlCell); /* Verify it is accessible */ KeyNode = (PCM_KEY_NODE)HvGetCell(SystemHive, ControlCell); @@ -208,10 +213,10 @@ RegEnumKey( { TRACE("RegEnumKey index out of bounds (%d) in key (%.*s)\n", Index, KeyNode->NameLength, KeyNode->Name); - HvReleaseCell(Hive, (HCELL_INDEX)Key); + HvReleaseCell(Hive, HKEY_TO_HCI(Key)); return ERROR_NO_MORE_ITEMS; } - HvReleaseCell(Hive, (HCELL_INDEX)Key); + HvReleaseCell(Hive, HKEY_TO_HCI(Key)); /* Get the value cell */ SubKeyNode = (PCM_KEY_NODE)HvGetCell(Hive, CellIndex); @@ -247,7 +252,7 @@ RegEnumKey( HvReleaseCell(Hive, CellIndex); if (SubKey != NULL) - *SubKey = (HKEY)CellIndex; + *SubKey = HCI_TO_HKEY(CellIndex); TRACE("RegEnumKey done -> %u, '%.*S'\n", *NameSize, *NameSize, Name); return ERROR_SUCCESS; @@ -315,7 +320,7 @@ RegOpenKey( else { /* Use the parent key */ - CellIndex = (HCELL_INDEX)ParentKey; + CellIndex = HKEY_TO_HCI(ParentKey); } /* Check if this is the root key */ @@ -330,7 +335,7 @@ RegOpenKey( if (RtlEqualUnicodeString(&SubKeyName, &CurrentControlSet, TRUE)) { /* Use the CurrentControlSetKey and update the remaining path */ - CellIndex = (HCELL_INDEX)CurrentControlSetKey; + CellIndex = HKEY_TO_HCI(CurrentControlSetKey); RemainingPath = TempPath; } } @@ -366,7 +371,7 @@ RegOpenKey( } HvReleaseCell(Hive, CellIndex); - *Key = (HKEY)CellIndex; + *Key = HCI_TO_HKEY(CellIndex); return ERROR_SUCCESS; } @@ -438,10 +443,10 @@ RegQueryValue( { TRACE("RegQueryValue value not found in key (%.*s)\n", KeyNode->NameLength, KeyNode->Name); - HvReleaseCell(Hive, (HCELL_INDEX)Key); + HvReleaseCell(Hive, HKEY_TO_HCI(Key)); return ERROR_FILE_NOT_FOUND; } - HvReleaseCell(Hive, (HCELL_INDEX)Key); + HvReleaseCell(Hive, HKEY_TO_HCI(Key)); /* Get the value cell */ ValueCell = (PCM_KEY_VALUE)HvGetCell(Hive, CellIndex); @@ -490,7 +495,7 @@ RegEnumValue( (Index >= KeyNode->ValueList.Count)) { ERR("RegEnumValue: index invalid\n"); - HvReleaseCell(Hive, (HCELL_INDEX)Key); + HvReleaseCell(Hive, HKEY_TO_HCI(Key)); return ERROR_NO_MORE_ITEMS; } @@ -532,7 +537,7 @@ RegEnumValue( HvReleaseCell(Hive, ValueListCell->KeyList[Index]); HvReleaseCell(Hive, KeyNode->ValueList.List); - HvReleaseCell(Hive, (HCELL_INDEX)Key); + HvReleaseCell(Hive, HKEY_TO_HCI(Key)); TRACE("RegEnumValue done -> %u, '%.*S'\n", *NameSize, *NameSize, ValueName); return ERROR_SUCCESS; diff --git a/boot/freeldr/freeldr/ntldr/registry.h b/boot/freeldr/freeldr/ntldr/registry.h index 96ed98d7e52..769d5b7c477 100644 --- a/boot/freeldr/freeldr/ntldr/registry.h +++ b/boot/freeldr/freeldr/ntldr/registry.h @@ -25,6 +25,8 @@ typedef HANDLE HKEY, *PHKEY; +#define HKEY_TO_HCI(hKey) ((HCELL_INDEX)(ULONG_PTR)(hKey)) + BOOLEAN RegImportBinaryHive( _In_ PVOID ChunkBase, diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index 88f8c1731ae..23fda355ef9 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -515,7 +515,7 @@ WinLdrScanRegistry( /* Find all boot drivers */ Success = CmpFindDrivers(SystemHive, - (HCELL_INDEX)CurrentControlSetKey, + HKEY_TO_HCI(CurrentControlSetKey), BootLoad, BootFileSystem, BootDriverListHead); @@ -524,7 +524,7 @@ WinLdrScanRegistry( /* Sort by group/tag */ Success = CmpSortDriverList(SystemHive, - (HCELL_INDEX)CurrentControlSetKey, + HKEY_TO_HCI(CurrentControlSetKey), BootDriverListHead); if (!Success) goto Quit; diff --git a/sdk/lib/cmlib/hivedata.h b/sdk/lib/cmlib/hivedata.h index 20e844f8306..39d617ccbd5 100644 --- a/sdk/lib/cmlib/hivedata.h +++ b/sdk/lib/cmlib/hivedata.h @@ -77,7 +77,7 @@ * the other bits specify index into the hive file. The value HCELL_NULL * (-1) is reserved for marking invalid cells. */ -typedef ULONG_PTR HCELL_INDEX, *PHCELL_INDEX; +typedef ULONG HCELL_INDEX, *PHCELL_INDEX; // // Cell Magic Values @@ -152,11 +152,7 @@ typedef struct _HBASE_BLOCK of the full name of the hive file */ WCHAR FileName[HIVE_FILENAME_MAXLEN + 1]; -#ifdef _WIN64 - ULONG Reserved1[98]; -#else ULONG Reserved1[99]; -#endif /* Checksum of first 0x200 bytes */ ULONG CheckSum; @@ -167,7 +163,6 @@ typedef struct _HBASE_BLOCK } HBASE_BLOCK, *PHBASE_BLOCK; C_ASSERT(sizeof(HBASE_BLOCK) == HBLOCK_SIZE); -C_ASSERT(FIELD_OFFSET(HBASE_BLOCK, CheckSum) == 0x200 - sizeof(ULONG)); typedef struct _HBIN {

2 years, 8 months

[reactos] 01/01: [WIN32SS] Do not call DrvEnableDriver/DrvDisableDriver for LDEV_IMAGE types

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ce59851096c10fdc82ea… commit 0ce59851096c10fdc82ea9e4dd483d1105a48a96 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Apr 17 13:52:10 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Apr 17 16:20:04 2022 +0200 [WIN32SS] Do not call DrvEnableDriver/DrvDisableDriver for LDEV_IMAGE types --- win32ss/gdi/eng/ldevobj.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index 03b9223e4a9..0051a4c3842 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -174,6 +174,9 @@ LDEVOBJ_bEnableDriver( ASSERT(pldev); ASSERT(pldev->cRefs == 0); + if (pldev->ldevtype == LDEV_IMAGE) + return TRUE; + /* Call the drivers DrvEnableDriver function */ RtlZeroMemory(&ded, sizeof(ded)); if (!pfnEnableDriver(GDI_ENGINE_VERSION, sizeof(ded), &ded)) @@ -205,6 +208,9 @@ LDEVOBJ_vDisableDriver( TRACE("LDEVOBJ_vDisableDriver('%wZ')\n", &pldev->pGdiDriverInfo->DriverName); + if (pldev->ldevtype == LDEV_IMAGE) + return; + if (pldev->pfn.DisableDriver) { /* Call the unload function */ @@ -430,20 +436,16 @@ LDEVOBJ_pLoadDriver( goto leave; } - /* Shall we load a driver? */ - if (ldevtype != LDEV_IMAGE) + /* Load the driver */ + if (!LDEVOBJ_bEnableDriver(pldev, pldev->pGdiDriverInfo->EntryPoint)) { - /* Load the driver */ - if (!LDEVOBJ_bEnableDriver(pldev, pldev->pGdiDriverInfo->EntryPoint)) - { - ERR("LDEVOBJ_bEnableDriver failed\n"); + ERR("LDEVOBJ_bEnableDriver failed\n"); - /* Unload the image. */ - LDEVOBJ_bUnloadImage(pldev); - LDEVOBJ_vFreeLDEV(pldev); - pldev = NULL; - goto leave; - } + /* Unload the image. */ + LDEVOBJ_bUnloadImage(pldev); + LDEVOBJ_vFreeLDEV(pldev); + pldev = NULL; + goto leave; } /* Insert the LDEV into the global list */

2 years, 8 months

[reactos] 01/01: [CMLIB] Fix 64-bit build. Addendum to 93d8a1b7b.

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=168fea0eee0acdf63461b… commit 168fea0eee0acdf63461b7ac65fa607ab49cadbb Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Apr 17 16:14:36 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Apr 17 16:16:41 2022 +0300 [CMLIB] Fix 64-bit build. Addendum to 93d8a1b7b. Thanks to Hervé Poussineau for help. --- sdk/lib/cmlib/hivedata.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sdk/lib/cmlib/hivedata.h b/sdk/lib/cmlib/hivedata.h index 39d617ccbd5..20e844f8306 100644 --- a/sdk/lib/cmlib/hivedata.h +++ b/sdk/lib/cmlib/hivedata.h @@ -77,7 +77,7 @@ * the other bits specify index into the hive file. The value HCELL_NULL * (-1) is reserved for marking invalid cells. */ -typedef ULONG HCELL_INDEX, *PHCELL_INDEX; +typedef ULONG_PTR HCELL_INDEX, *PHCELL_INDEX; // // Cell Magic Values @@ -152,7 +152,11 @@ typedef struct _HBASE_BLOCK of the full name of the hive file */ WCHAR FileName[HIVE_FILENAME_MAXLEN + 1]; +#ifdef _WIN64 + ULONG Reserved1[98]; +#else ULONG Reserved1[99]; +#endif /* Checksum of first 0x200 bytes */ ULONG CheckSum; @@ -163,6 +167,7 @@ typedef struct _HBASE_BLOCK } HBASE_BLOCK, *PHBASE_BLOCK; C_ASSERT(sizeof(HBASE_BLOCK) == HBLOCK_SIZE); +C_ASSERT(FIELD_OFFSET(HBASE_BLOCK, CheckSum) == 0x200 - sizeof(ULONG)); typedef struct _HBIN {

2 years, 8 months

[reactos] 01/01: [SETUPAPI] SetupDiCreateDeviceInfoW creates phantom devices

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a355e8ad2733d3d4fadaa… commit a355e8ad2733d3d4fadaa143e415e415e6d76745 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 17 14:29:14 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 17 14:29:14 2022 +0200 [SETUPAPI] SetupDiCreateDeviceInfoW creates phantom devices --- dll/win32/setupapi/devinst.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index c3d4a68f977..065c857bb22 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -2,7 +2,7 @@ * SetupAPI device installer * * Copyright 2000 Andreas Mohr for CodeWeavers - * 2005-2006 Herv� Poussineau (hpoussin(a)reactos.org) + * 2005-2006 Hervé Poussineau (hpoussin(a)reactos.org) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1636,6 +1636,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW( cr = CM_Create_DevInst_ExW(&DevInst, (DEVINSTID)DeviceName, RootDevInst, + CM_CREATE_DEVINST_PHANTOM | (CreationFlags & DICD_GENERATE_ID) ? CM_CREATE_DEVINST_GENERATE_ID : 0, set->hMachine);

2 years, 8 months

← Newer
1
...
4
5
6
7
8
9
10
...
16
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 April 2022