Ros-diffs March 2025

ros-diffs@reactos.org

15 participants
66 discussions

[reactos] 01/01: [NTOS:MM] Fix broken ASSERT

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6853581c5203a52cd882… commit c6853581c5203a52cd8825428e56f2cfcfe4c9f5 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Feb 26 10:33:32 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Mar 4 15:24:53 2025 +0200 [NTOS:MM] Fix broken ASSERT There is no guarantee that all pages in the requested range actually exist. --- ntoskrnl/mm/freelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/freelist.c b/ntoskrnl/mm/freelist.c index 6f2f99bfc3c..0147fb09a90 100644 --- a/ntoskrnl/mm/freelist.c +++ b/ntoskrnl/mm/freelist.c @@ -318,7 +318,7 @@ MiAllocatePagesForMdl(IN PHYSICAL_ADDRESS LowAddress, // Get the PFN entry for this page // Pfn1 = MiGetPfnEntry(Page); - ASSERT(Pfn1); + if (!Pfn1) continue; // // Make sure it's free and if this is our first pass, zeroed

3 months, 4 weeks

[reactos] 01/01: [NTOS:MM:PS] Little fixes for NTDLL loading (#7707)

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d605ec26f7516cb7368b… commit 4d605ec26f7516cb7368b83a7aeb7df5ce785cd1 Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Tue Mar 4 03:36:21 2025 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 3 20:36:21 2025 +0100 [NTOS:MM:PS] Little fixes for NTDLL loading (#7707) - [NTOS:PS] `STATUS_INVALID_IMAGE_PROTECT` returned by `MmCheckSystemImage` should be a fatal error too. - [NTOS:PS] Fix object attributes for opening NTDLL. - [NTOS:MM] Remove `MmCheckSystemImage` unused parameter. - [NTOS:MM] Inline `MmVerifyImageIsOkForMpUse` in `MmCheckSystemImage`, reducing a call to `RtlImageNtHeader`. --- ntoskrnl/include/internal/mm.h | 4 +--- ntoskrnl/mm/ARM3/sysldr.c | 12 +++++++----- ntoskrnl/ps/psmgr.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 1c3870d6370..29e84072abf 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1652,9 +1652,7 @@ MmUnloadSystemImage( NTSTATUS NTAPI MmCheckSystemImage( - IN HANDLE ImageHandle, - IN BOOLEAN PurgeSection -); + _In_ HANDLE ImageHandle); NTSTATUS NTAPI diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index eb1544babbf..eaa1a7f76d4 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -2751,8 +2751,8 @@ MmVerifyImageIsOkForMpUse( NTSTATUS NTAPI -MmCheckSystemImage(IN HANDLE ImageHandle, - IN BOOLEAN PurgeSection) +MmCheckSystemImage( + _In_ HANDLE ImageHandle) { NTSTATUS Status; HANDLE SectionHandle; @@ -2846,12 +2846,14 @@ MmCheckSystemImage(IN HANDLE ImageHandle, goto Fail; } - /* Check that it's a valid SMP image if we have more then one CPU */ - if (!MmVerifyImageIsOkForMpUse(ViewBase)) +#ifdef CONFIG_SMP + /* Check that it's a valid SMP image if we have more than one CPU */ + if (!MiVerifyImageIsOkForMpUse(NtHeaders)) { /* Otherwise it's not the right image */ Status = STATUS_IMAGE_MP_UP_MISMATCH; } +#endif // CONFIG_SMP } /* Unmap the section, close the handle, and return status */ @@ -3180,7 +3182,7 @@ LoaderScan: } /* Validate it */ - Status = MmCheckSystemImage(FileHandle, FALSE); + Status = MmCheckSystemImage(FileHandle); if ((Status == STATUS_IMAGE_CHECKSUM_MISMATCH) || (Status == STATUS_IMAGE_MP_UP_MISMATCH) || (Status == STATUS_INVALID_IMAGE_PROTECT)) diff --git a/ntoskrnl/ps/psmgr.c b/ntoskrnl/ps/psmgr.c index bd642375a88..0d80257bd46 100644 --- a/ntoskrnl/ps/psmgr.c +++ b/ntoskrnl/ps/psmgr.c @@ -196,7 +196,7 @@ PsLocateSystemDll(VOID) /* Locate and open NTDLL to determine ImageBase and LdrStartup */ InitializeObjectAttributes(&ObjectAttributes, &PsNtDllPathName, - 0, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); Status = ZwOpenFile(&FileHandle, @@ -212,8 +212,8 @@ PsLocateSystemDll(VOID) } /* Check if the image is valid */ - Status = MmCheckSystemImage(FileHandle, TRUE); - if (Status == STATUS_IMAGE_CHECKSUM_MISMATCH) + Status = MmCheckSystemImage(FileHandle); + if (Status == STATUS_IMAGE_CHECKSUM_MISMATCH || Status == STATUS_INVALID_IMAGE_PROTECT) { /* Raise a hard error */ HardErrorParameters = (ULONG_PTR)&PsNtDllPathName;

3 months, 4 weeks

[reactos] 01/01: [NTOS:MM] Split MmVerifyImageIsOkForMpUse() into an auxiliary inlined helper.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c23a2e38e9c49828364a… commit 7c23a2e38e9c49828364a7b02c2116fd0964b94e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 3 20:29:36 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 3 20:30:54 2025 +0100 [NTOS:MM] Split MmVerifyImageIsOkForMpUse() into an auxiliary inlined helper. This helper is used when an existing NtHeader is already available. --- ntoskrnl/mm/ARM3/sysldr.c | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index 2cdfc365cc7..eb1544babbf 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -2716,30 +2716,39 @@ MiEnablePagingOfDriver(IN PLDR_DATA_TABLE_ENTRY LdrEntry) if (PointerPte) MiSetPagingOfDriver(PointerPte, LastPte); } +FORCEINLINE BOOLEAN -NTAPI -MmVerifyImageIsOkForMpUse(IN PVOID BaseAddress) +MiVerifyImageIsOkForMpUse( + _In_ PIMAGE_NT_HEADERS NtHeaders) { - PIMAGE_NT_HEADERS NtHeader; - PAGED_CODE(); - - /* Get NT Headers */ - NtHeader = RtlImageNtHeader(BaseAddress); - if (NtHeader) + /* Fail if we have 2+ CPUs, but the image is only safe for UP */ + if ((KeNumberProcessors > 1) && + (NtHeaders->FileHeader.Characteristics & IMAGE_FILE_UP_SYSTEM_ONLY)) { - /* Check if this image is only safe for UP while we have 2+ CPUs */ - if ((KeNumberProcessors > 1) && - (NtHeader->FileHeader.Characteristics & IMAGE_FILE_UP_SYSTEM_ONLY)) - { - /* Fail */ - return FALSE; - } + return FALSE; } - - /* Otherwise, it's safe */ + /* Otherwise, it's safe to use */ return TRUE; } +// TODO: Use this function to verify that the loaded boot drivers +// (in ExpLoadBootSymbols) are compatible with MP. +BOOLEAN +NTAPI +MmVerifyImageIsOkForMpUse( + _In_ PVOID BaseAddress) +{ + PIMAGE_NT_HEADERS NtHeaders; + PAGED_CODE(); + + /* Get the NT headers. If none, suppose the image + * is safe to use, otherwise invoke the helper. */ + NtHeaders = RtlImageNtHeader(BaseAddress); + if (!NtHeaders) + return TRUE; + return MiVerifyImageIsOkForMpUse(NtHeaders); +} + NTSTATUS NTAPI MmCheckSystemImage(IN HANDLE ImageHandle,

3 months, 4 weeks

[reactos] 01/01: [NTDLL_VISTA:LDR] Implement DLL Notification (#6795)

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ccf1e97aa1bd056b4d4b7… commit ccf1e97aa1bd056b4d4b7ce6fae1a4b089c6c25b Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Mon Mar 3 04:13:33 2025 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 2 21:13:33 2025 +0100 [NTDLL_VISTA:LDR] Implement DLL Notification (#6795) Implement DLL Load Notification, an NT6+ feature. https://learn.microsoft.com/en-us/windows/win32/devnotes/dll-load-notificat… - [RTL] Sync `RTL_STATIC_LIST_HEAD` and `RtlFailFast` from XDK to NDK. - [NTDLL_VISTA] Introduce ntdll_vista_static static library and link both ntdll_vista and ntdll to it. - [NDK][LDR] Add and fix DLL Notification definitions. - [NTDLL_VISTA] Code improvements. - [NTDLL_VISTA:LDR] Implement Dll Notification. - [NTDLL][NTDLL_APITEST] Add Dll Notification API test. --- dll/ntdll/CMakeLists.txt | 2 +- dll/ntdll/def/ntdll.spec | 4 +- dll/ntdll/include/ntdllp.h | 14 ++ dll/ntdll/ldr/ldrapi.c | 8 +- dll/ntdll/ldr/ldrinit.c | 5 +- dll/ntdll/ldr/ldrutils.c | 7 +- dll/ntdll/nt_0600/CMakeLists.txt | 11 +- dll/ntdll/nt_0600/DllMain.c | 23 +- dll/ntdll/nt_0600/ldr/ldrinit.c | 3 + dll/ntdll/nt_0600/ldr/ldrnotify.c | 154 ++++++++++++++ dll/ntdll/nt_0600/ntdll_vista.h | 21 ++ dll/ntdll/nt_0600/ntdll_vista.spec | 3 + modules/rostests/apitests/ntdll/CMakeLists.txt | 6 +- .../rostests/apitests/ntdll/DllLoadNotification.c | 235 +++++++++++++++++++++ .../apitests/ntdll/empty_dll/CMakeLists.txt | 6 + .../rostests/apitests/ntdll/empty_dll/empty_dll.c | 11 + modules/rostests/apitests/ntdll/testdata.rc | 1 + modules/rostests/apitests/ntdll/testlist.c | 2 + sdk/include/ndk/ldrfuncs.h | 17 ++ sdk/include/ndk/ldrtypes.h | 39 +++- sdk/include/ndk/rtlfuncs.h | 12 ++ sdk/include/xdk/rtlfuncs.h | 6 +- 22 files changed, 538 insertions(+), 52 deletions(-) diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt index fdd7c11262a..155ee21d4b5 100644 --- a/dll/ntdll/CMakeLists.txt +++ b/dll/ntdll/CMakeLists.txt @@ -65,7 +65,7 @@ set_module_type(ntdll win32dll ENTRYPOINT 0) set_subsystem(ntdll console) ################# END HACK ################# -target_link_libraries(ntdll etwtrace csrlib rtl rtl_um rtl_vista ntdllsys libcntpr uuid ${PSEH_LIB}) +target_link_libraries(ntdll ntdll_vista_static etwtrace csrlib rtl rtl_um rtl_vista ntdllsys libcntpr uuid ${PSEH_LIB}) if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600) target_link_libraries(ntdll cryptlib) endif() diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index b023b06f9c3..de0d7f19516 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -170,7 +170,7 @@ @ stdcall LdrQueryImageFileKeyOption(ptr ptr long ptr long ptr) @ stdcall -stub -version=0x600+ LdrQueryModuleServiceTags(ptr ptr ptr) @ stdcall LdrQueryProcessModuleInformation(ptr long ptr) -@ stdcall -stub -version=0x600+ LdrRegisterDllNotification(long ptr ptr ptr) +@ stdcall -version=0x600+ LdrRegisterDllNotification(long ptr ptr ptr) @ stdcall -stub -version=0x600+ LdrRemoveLoadAsDataTable(ptr ptr ptr long) @ stub -version=0x600+ LdrResFindResource @ stub -version=0x600+ LdrResFindResourceDirectory @@ -185,7 +185,7 @@ @ stub -version=0x600+ LdrUnloadAlternateResourceModuleEx @ stdcall LdrUnloadDll(ptr) @ stdcall LdrUnlockLoaderLock(long ptr) -@ stdcall -stub -version=0x600+ LdrUnregisterDllNotification(ptr) +@ stdcall -version=0x600+ LdrUnregisterDllNotification(ptr) @ stdcall LdrVerifyImageMatchesChecksum(ptr long long long) @ stdcall -stub -version=0x600+ LdrVerifyImageMatchesChecksumEx(ptr ptr) @ stub -version=0x600+ LdrpResGetMappingSize diff --git a/dll/ntdll/include/ntdllp.h b/dll/ntdll/include/ntdllp.h index c5ea35a2761..bbef5444e86 100644 --- a/dll/ntdll/include/ntdllp.h +++ b/dll/ntdll/include/ntdllp.h @@ -229,6 +229,15 @@ VOID NTAPI LdrpFinalizeAndDeallocateDataTableEntry(IN PLDR_DATA_TABLE_ENTRY Entry); +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) || (DLL_EXPORT_VERSION >= _WIN32_WINNT_VISTA) + +VOID +NTAPI +LdrpSendDllNotifications( + _In_ PLDR_DATA_TABLE_ENTRY DllEntry, + _In_ ULONG NotificationReason); + +#endif /* (_WIN32_WINNT >= _WIN32_WINNT_VISTA) || (DLL_EXPORT_VERSION >= _WIN32_WINNT_VISTA) */ /* path.c */ BOOLEAN @@ -242,6 +251,11 @@ NTAPI RtlpInitializeKeyedEvent( VOID); +VOID +NTAPI +RtlpCloseKeyedEvent( + VOID); + VOID NTAPI RtlpInitializeThreadPooling( diff --git a/dll/ntdll/ldr/ldrapi.c b/dll/ntdll/ldr/ldrapi.c index a688385cc3a..8bb1f25ae13 100644 --- a/dll/ntdll/ldr/ldrapi.c +++ b/dll/ntdll/ldr/ldrapi.c @@ -1497,6 +1497,11 @@ LdrUnloadDll( DPRINT1("LDR: Unmapping [%ws]\n", LdrEntry->BaseDllName.Buffer); } +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) || (DLL_EXPORT_VERSION >= _WIN32_WINNT_VISTA) + /* Send shutdown notification */ + LdrpSendDllNotifications(CurrentEntry, LDR_DLL_NOTIFICATION_REASON_UNLOADED); +#endif + /* Check if this is a .NET executable */ CorImageData = RtlImageDirectoryEntryToData(LdrEntry->DllBase, TRUE, @@ -1520,9 +1525,6 @@ LdrUnloadDll( /* Unload the alternate resource module, if any */ LdrUnloadAlternateResourceModule(CurrentEntry->DllBase); - /* FIXME: Send shutdown notification */ - //LdrpSendDllNotifications(CurrentEntry, 2, LdrpShutdownInProgress); - /* Check if a Hotpatch is active */ if (LdrEntry->PatchInformation) { diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index cde86383759..64831f660dd 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -56,9 +56,7 @@ ULONG LdrpNumberOfProcessors; PVOID NtDllBase; extern LARGE_INTEGER RtlpTimeout; extern BOOLEAN RtlpTimeoutDisable; -PVOID LdrpHeap; LIST_ENTRY LdrpHashTable[LDR_HASH_TABLE_ENTRIES]; -LIST_ENTRY LdrpDllNotificationList; HANDLE LdrpKnownDllObjectDirectory; UNICODE_STRING LdrpKnownDllPath; WCHAR LdrpKnownDllPathBuffer[128]; @@ -2008,9 +2006,8 @@ LdrpInitializeProcess(IN PCONTEXT Context, //Peb->FastPebLockRoutine = (PPEBLOCKROUTINE)RtlEnterCriticalSection; //Peb->FastPebUnlockRoutine = (PPEBLOCKROUTINE)RtlLeaveCriticalSection; - /* Setup Callout Lock and Notification list */ + /* Setup Callout Lock */ //RtlInitializeCriticalSection(&RtlpCalloutEntryLock); - InitializeListHead(&LdrpDllNotificationList); /* For old executables, use 16-byte aligned heap */ if ((NtHeader->OptionalHeader.MajorSubsystemVersion <= 3) && diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index e46bb3446dd..19c90865531 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -1226,7 +1226,12 @@ SkipCheck: /* Insert this entry */ LdrpInsertMemoryTableEntry(LdrEntry); - // LdrpSendDllNotifications(LdrEntry, TRUE, Status == STATUS_IMAGE_NOT_AT_BASE) +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) || (DLL_EXPORT_VERSION >= _WIN32_WINNT_VISTA) + LdrpSendDllNotifications(LdrEntry, LDR_DLL_NOTIFICATION_REASON_LOADED); +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) + LdrEntry->Flags |= LDRP_LOAD_NOTIFICATIONS_SENT; /* LdrEntry->LoadNotificationsSent = TRUE; */ +#endif +#endif /* Check for invalid CPU Image */ if (Status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) diff --git a/dll/ntdll/nt_0600/CMakeLists.txt b/dll/ntdll/nt_0600/CMakeLists.txt index 2eec0df9940..69b9b5f0ff8 100644 --- a/dll/ntdll/nt_0600/CMakeLists.txt +++ b/dll/ntdll/nt_0600/CMakeLists.txt @@ -11,12 +11,15 @@ include_directories( ${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys) list(APPEND SOURCE - DllMain.c - ${CMAKE_CURRENT_BINARY_DIR}/ntdll_vista.def) + ldr/ldrinit.c + ldr/ldrnotify.c) -add_library(ntdll_vista MODULE ${SOURCE} ntdll_vista.rc) +add_library(ntdll_vista_static ${SOURCE}) +target_link_libraries(ntdll_vista_static) +add_dependencies(ntdll_vista_static psdk) +add_library(ntdll_vista MODULE DllMain.c ${CMAKE_CURRENT_BINARY_DIR}/ntdll_vista.def ntdll_vista.rc) set_module_type(ntdll_vista win32dll ENTRYPOINT DllMain 12) -target_link_libraries(ntdll_vista smlib rtl_vista) +target_link_libraries(ntdll_vista ntdll_vista_static smlib rtl_vista ${PSEH_LIB}) if(ARCH STREQUAL "arm") target_link_libraries(ntdll_vista chkstk) endif() diff --git a/dll/ntdll/nt_0600/DllMain.c b/dll/ntdll/nt_0600/DllMain.c index 90a01419b97..38a0d448916 100644 --- a/dll/ntdll/nt_0600/DllMain.c +++ b/dll/ntdll/nt_0600/DllMain.c @@ -1,25 +1,4 @@ -#include <stdarg.h> - -#define WIN32_NO_STATUS - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <winuser.h> -#include <winwlx.h> -#include <ndk/rtltypes.h> -#include <ndk/umfuncs.h> - -#define NDEBUG -#include <debug.h> - -VOID -NTAPI -RtlpInitializeKeyedEvent(VOID); - -VOID -NTAPI -RtlpCloseKeyedEvent(VOID); +#include "ntdll_vista.h" BOOL WINAPI diff --git a/dll/ntdll/nt_0600/ldr/ldrinit.c b/dll/ntdll/nt_0600/ldr/ldrinit.c new file mode 100644 index 00000000000..e9251d9ebf5 --- /dev/null +++ b/dll/ntdll/nt_0600/ldr/ldrinit.c @@ -0,0 +1,3 @@ +#include "ntdll_vista.h" + +PVOID LdrpHeap; diff --git a/dll/ntdll/nt_0600/ldr/ldrnotify.c b/dll/ntdll/nt_0600/ldr/ldrnotify.c new file mode 100644 index 00000000000..70ae996c131 --- /dev/null +++ b/dll/ntdll/nt_0600/ldr/ldrnotify.c @@ -0,0 +1,154 @@ +/* + * PROJECT: ReactOS NT Layer/System API + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: DLL Load Notification Implementation + * COPYRIGHT: Copyright 2024 Ratin Gao <ratin(a)knsoft.org> + */ + +#include "ntdll_vista.h" + +/* GLOBALS *******************************************************************/ + +typedef struct _LDR_DLL_NOTIFICATION_ENTRY +{ + LIST_ENTRY List; + PLDR_DLL_NOTIFICATION_FUNCTION Callback; + PVOID Context; +} LDR_DLL_NOTIFICATION_ENTRY, *PLDR_DLL_NOTIFICATION_ENTRY; + +static RTL_STATIC_LIST_HEAD(LdrpDllNotificationList); + +/* Initialize critical section statically */ +static RTL_CRITICAL_SECTION LdrpDllNotificationLock; +static RTL_CRITICAL_SECTION_DEBUG LdrpDllNotificationLockDebug = { + .CriticalSection = &LdrpDllNotificationLock +}; +static RTL_CRITICAL_SECTION LdrpDllNotificationLock = { + &LdrpDllNotificationLockDebug, + -1, + 0, + 0, + 0, + 0 +}; + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +LdrRegisterDllNotification( + _In_ ULONG Flags, + _In_ PLDR_DLL_NOTIFICATION_FUNCTION NotificationFunction, + _In_opt_ PVOID Context, + _Out_ PVOID *Cookie) +{ + PLDR_DLL_NOTIFICATION_ENTRY NewEntry; + + /* Check input parameters */ + if (Flags != 0 || NotificationFunction == NULL || Cookie == NULL) + { + return STATUS_INVALID_PARAMETER; + } + + /* Allocate new entry and assign input values */ + NewEntry = RtlAllocateHeap(LdrpHeap, 0, sizeof(*NewEntry)); + if (NewEntry == NULL) + { + return STATUS_NO_MEMORY; + } + NewEntry->Callback = NotificationFunction; + NewEntry->Context = Context; + + /* Add node to the end of global list */ + RtlEnterCriticalSection(&LdrpDllNotificationLock); + InsertTailList(&LdrpDllNotificationList, &NewEntry->List); + RtlLeaveCriticalSection(&LdrpDllNotificationLock); + + /* Cookie is address of the new entry */ + *Cookie = NewEntry; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +LdrUnregisterDllNotification( + _In_ PVOID Cookie) +{ + NTSTATUS Status = STATUS_DLL_NOT_FOUND; + PLIST_ENTRY Entry; + + /* Find entry to remove */ + RtlEnterCriticalSection(&LdrpDllNotificationLock); + for (Entry = LdrpDllNotificationList.Flink; + Entry != &LdrpDllNotificationList; + Entry = Entry->Flink) + { + if (Entry == Cookie) + { + RemoveEntryList(Entry); + Status = STATUS_SUCCESS; + break; + } + } + RtlLeaveCriticalSection(&LdrpDllNotificationLock); + + if (NT_SUCCESS(Status)) + { + RtlFreeHeap(LdrpHeap, 0, Entry); + } + return Status; +} + +VOID +NTAPI +LdrpSendDllNotifications( + _In_ PLDR_DATA_TABLE_ENTRY DllEntry, + _In_ ULONG NotificationReason) +{ + PLIST_ENTRY Entry; + PLDR_DLL_NOTIFICATION_ENTRY NotificationEntry; + LDR_DLL_NOTIFICATION_DATA NotificationData; + + /* + * LDR_DLL_LOADED_NOTIFICATION_DATA and LDR_DLL_UNLOADED_NOTIFICATION_DATA + * currently are the same. Use C_ASSERT to ensure it, then fill either of them. + */ +#define LdrpAssertDllNotificationDataMember(x)\ + C_ASSERT(FIELD_OFFSET(LDR_DLL_NOTIFICATION_DATA, Loaded.x) ==\ + FIELD_OFFSET(LDR_DLL_NOTIFICATION_DATA, Unloaded.x)) + + C_ASSERT(sizeof(NotificationData.Loaded) == sizeof(NotificationData.Unloaded)); + LdrpAssertDllNotificationDataMember(Flags); + LdrpAssertDllNotificationDataMember(FullDllName); + LdrpAssertDllNotificationDataMember(BaseDllName); + LdrpAssertDllNotificationDataMember(DllBase); + LdrpAssertDllNotificationDataMember(SizeOfImage); + +#undef LdrpAssertDllNotificationDataMember + + NotificationData.Loaded.Flags = 0; /* Reserved and always 0, not DllEntry->Flags */ + NotificationData.Loaded.FullDllName = &DllEntry->FullDllName; + NotificationData.Loaded.BaseDllName = &DllEntry->BaseDllName; + NotificationData.Loaded.DllBase = DllEntry->DllBase; + NotificationData.Loaded.SizeOfImage = DllEntry->SizeOfImage; + + /* Send notification to all registered callbacks */ + RtlEnterCriticalSection(&LdrpDllNotificationLock); + _SEH2_TRY + { + for (Entry = LdrpDllNotificationList.Flink; + Entry != &LdrpDllNotificationList; + Entry = Entry->Flink) + { + NotificationEntry = CONTAINING_RECORD(Entry, LDR_DLL_NOTIFICATION_ENTRY, List); + NotificationEntry->Callback(NotificationReason, + &NotificationData, + NotificationEntry->Context); + } + } + _SEH2_FINALLY + { + RtlLeaveCriticalSection(&LdrpDllNotificationLock); + } + _SEH2_END; +} diff --git a/dll/ntdll/nt_0600/ntdll_vista.h b/dll/ntdll/nt_0600/ntdll_vista.h new file mode 100644 index 00000000000..47051576c5c --- /dev/null +++ b/dll/ntdll/nt_0600/ntdll_vista.h @@ -0,0 +1,21 @@ +#pragma once + +#define _NTSYSTEM_ +#define _NTDLLBUILD_ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winnt.h> + +#define NTOS_MODE_USER +#include <ndk/rtlfuncs.h> +#include <ndk/umfuncs.h> +#include <ndk/ldrfuncs.h> + +#define NDEBUG +#include <debug.h> + +#include "../include/ntdllp.h" diff --git a/dll/ntdll/nt_0600/ntdll_vista.spec b/dll/ntdll/nt_0600/ntdll_vista.spec index d36c6449d8e..2bf9f747a00 100644 --- a/dll/ntdll/nt_0600/ntdll_vista.spec +++ b/dll/ntdll/nt_0600/ntdll_vista.spec @@ -1,3 +1,6 @@ +@ stdcall LdrRegisterDllNotification(long ptr ptr ptr) +@ stdcall LdrUnregisterDllNotification(ptr) + @ stdcall RtlInitializeConditionVariable(ptr) @ stdcall RtlWakeConditionVariable(ptr) @ stdcall RtlWakeAllConditionVariable(ptr) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 29c1cf96ed9..e371e95305f 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -1,11 +1,14 @@ add_subdirectory(load_notifications) +add_subdirectory(empty_dll) include_directories($<TARGET_FILE_DIR:load_notifications>) +include_directories($<TARGET_FILE_DIR:empty_dll>) include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) spec2def(ntdll_apitest.exe ntdll_apitest.spec) list(APPEND SOURCE + DllLoadNotification.c LdrEnumResources.c LdrLoadDll.c load_notifications.c @@ -118,6 +121,7 @@ list(APPEND PCH_SKIP_SOURCE testlist.c) add_rc_deps(testdata.rc ${CMAKE_CURRENT_BINARY_DIR}/load_notifications/load_notifications.dll) +add_rc_deps(testdata.rc ${CMAKE_CURRENT_BINARY_DIR}/empty_dll/empty_dll.dll) add_executable(ntdll_apitest ${SOURCE} @@ -135,7 +139,7 @@ target_link_libraries(ntdll_apitest rtl_test_lib wine uuid ${PSEH_LIB}) set_module_type(ntdll_apitest win32cui) add_importlibs(ntdll_apitest msvcrt advapi32 kernel32 ntdll) add_pch(ntdll_apitest precomp.h "${PCH_SKIP_SOURCE}") -add_dependencies(ntdll_apitest load_notifications) +add_dependencies(ntdll_apitest load_notifications empty_dll) if(NOT MSVC) set_source_files_properties(RtlGetFullPathName_UstrEx.c PROPERTIES COMPILE_OPTIONS "-Wno-format") diff --git a/modules/rostests/apitests/ntdll/DllLoadNotification.c b/modules/rostests/apitests/ntdll/DllLoadNotification.c new file mode 100644 index 00000000000..30ed50e38a3 --- /dev/null +++ b/modules/rostests/apitests/ntdll/DllLoadNotification.c @@ -0,0 +1,235 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Test for DLL Load Notification API + * COPYRIGHT: Copyright 2024 Ratin Gao <ratin(a)knsoft.org> + */ + +#define UNICODE + +#include "precomp.h" + +#include <winuser.h> + +static WCHAR g_szDllPath[MAX_PATH]; +static UNICODE_STRING g_usDllPath; +static UNICODE_STRING g_usDllName; +static volatile LONG g_lDllLoadCount = 0; + +typedef +NTSTATUS +NTAPI +FN_LdrRegisterDllNotification( + _In_ ULONG Flags, + _In_ PLDR_DLL_NOTIFICATION_FUNCTION NotificationFunction, + _In_opt_ PVOID Context, + _Out_ PVOID* Cookie); + +typedef +NTSTATUS +NTAPI +FN_LdrUnregisterDllNotification( + _In_ PVOID Cookie); + +static BOOL ExtractResource( + _In_z_ PCWSTR SavePath, + _In_ PCWSTR ResourceType, + _In_ PCWSTR ResourceName) +{ + BOOL bSuccess; + DWORD dwWritten, dwSize; + HGLOBAL hGlobal; + LPVOID pData; + HANDLE hFile; + HRSRC hRsrc; + + /* Load resource */ + if ((hRsrc = FindResourceW(NULL, ResourceName, ResourceType)) == NULL || + (dwSize = SizeofResource(NULL, hRsrc)) == 0 || + (hGlobal = LoadResource(NULL, hRsrc)) == NULL || + (pData = LockResource(hGlobal)) == NULL) + { + return FALSE; + } + + /* Save to file */ + hFile = CreateFileW(SavePath, + GENERIC_WRITE, + FILE_SHARE_READ, + NULL, + CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + return FALSE; + } + bSuccess = WriteFile(hFile, pData, dwSize, &dwWritten, NULL); + CloseHandle(hFile); + if (!bSuccess) + { + return FALSE; + } + else if (dwWritten != dwSize) + { + trace("Extract resource failed, written size (%lu) is not actual size (%lu)\n", dwWritten, dwSize); + DeleteFileW(SavePath); + SetLastError(ERROR_INCORRECT_SIZE); + return FALSE; + } + return TRUE; +} + +static VOID NTAPI DllLoadCallback( + _In_ ULONG NotificationReason, + _In_ PCLDR_DLL_NOTIFICATION_DATA NotificationData, + _In_opt_ PVOID Context) +{ + LONG lRet; + HMODULE* phNotifiedDllBase = Context; + + /* + * Verify the data, + * NotificationData->Loaded and NotificationData->Unloaded currently are the same. + */ + + /* Verify the FullDllName and BaseDllName */ + ok_eq_ulong(NotificationData->Loaded.Flags, 0UL); + lRet = RtlCompareUnicodeString(NotificationData->Loaded.FullDllName, + (PCUNICODE_STRING)&g_usDllPath, + TRUE); + ok_eq_long(lRet, 0L); + lRet = RtlCompareUnicodeString(NotificationData->Loaded.BaseDllName, + (PCUNICODE_STRING)&g_usDllName, + TRUE); + ok_eq_long(lRet, 0L); + + /* + * Verify SizeOfImage and read SizeOfImage from PE header, + * make sure the DLL is not unmapped, the memory is still accessible. + */ + ok_eq_ulong(NotificationData->Loaded.SizeOfImage, + RtlImageNtHeader(NotificationData->Loaded.DllBase)->OptionalHeader.SizeOfImage); + + /* Reason can be load or unload */ + ok(NotificationReason == LDR_DLL_NOTIFICATION_REASON_LOADED || + NotificationReason == LDR_DLL_NOTIFICATION_REASON_UNLOADED, "Incorrect NotificationReason\n"); + if (NotificationReason == LDR_DLL_NOTIFICATION_REASON_LOADED) + { + *phNotifiedDllBase = NotificationData->Loaded.DllBase; + InterlockedIncrement(&g_lDllLoadCount); + } + else if (NotificationReason == LDR_DLL_NOTIFICATION_REASON_UNLOADED) + { + InterlockedDecrement(&g_lDllLoadCount); + } +} + +START_TEST(DllLoadNotification) +{ + WCHAR szTempPath[MAX_PATH]; + PCWSTR pszDllName; + HMODULE hNtDll, hTestDll, hNotifiedDllBase; + FN_LdrRegisterDllNotification* pfnLdrRegisterDllNotification; + FN_LdrUnregisterDllNotification* pfnLdrUnregisterDllNotification; + NTSTATUS Status; + PVOID Cookie1, Cookie2; + + /* Load functions */ + hNtDll = GetModuleHandleW(L"ntdll.dll"); + if (hNtDll == NULL) + { + skip("GetModuleHandleW for ntdll failed with 0x%08lX\n", GetLastError()); + return; + } + pfnLdrRegisterDllNotification = (FN_LdrRegisterDllNotification*)GetProcAddress(hNtDll, "LdrRegisterDllNotification"); + pfnLdrUnregisterDllNotification = (FN_LdrUnregisterDllNotification*)GetProcAddress(hNtDll, "LdrUnregisterDllNotification"); + if (!pfnLdrRegisterDllNotification || !pfnLdrUnregisterDllNotification) + { + skip("ntdll.dll!Ldr[Un]RegisterDllNotification not found\n"); + return; + } + + /* Extract DLL to temp directory */ + if (!GetTempPathW(ARRAYSIZE(szTempPath), szTempPath)) + { + skip("GetTempPathW failed with 0x%08lX\n", GetLastError()); + return; + } + if (GetTempFileNameW(szTempPath, L"DLN", 0, g_szDllPath) == 0) + { + skip("GetTempFileNameW failed with 0x%08lX\n", GetLastError()); + return; + } + RtlInitUnicodeString(&g_usDllPath, g_szDllPath); + pszDllName = wcsrchr(g_szDllPath, L'\\') + 1; + if (pszDllName == NULL) + { + skip("Find file name of %ls failed\n", g_szDllPath); + return; + } + RtlInitUnicodeString(&g_usDllName, pszDllName); + if (!ExtractResource(g_szDllPath, RT_RCDATA, MAKEINTRESOURCEW(102))) + { + skip("ExtractResource failed with 0x%08lX\n", GetLastError()); + return; + } + + /* Register DLL load notification callback */ + hNotifiedDllBase = NULL; + Cookie1 = NULL; + Cookie2 = NULL; + Status = pfnLdrRegisterDllNotification(0, DllLoadCallback, &hNotifiedDllBase, &Cookie1); + ok_eq_bool(NT_SUCCESS(Status), TRUE); + ok(Cookie1 != NULL, "Cookie1 is NULL\n"); + + /* Register the callback again is valid */ + Status = pfnLdrRegisterDllNotification(0, DllLoadCallback, &hNotifiedDllBase, &Cookie2); + ok_eq_bool(NT_SUCCESS(Status), TRUE); + ok(Cookie2 != NULL, "Cookie2 is NULL\n"); + + /* Load the test DLL */ + hTestDll = LoadLibraryW(g_szDllPath); + if (!hTestDll) + { + skip("LoadLibraryW failed with 0x%08lX\n", GetLastError()); + goto _exit; + } + + /* Verify the Dll base received in callback and returned via context */ + ok_eq_pointer(hNotifiedDllBase, hTestDll); + + /* The count should be 2 because the callback was registered twice */ + ok_eq_long(g_lDllLoadCount, 2L); + + /* + * Callback will not be triggered because following + * load and unload actions change the DLL reference count only + */ + LoadLibraryW(g_szDllPath); + ok_eq_long(g_lDllLoadCount, 2L); + FreeLibrary(hTestDll); + ok_eq_long(g_lDllLoadCount, 2L); + + /* Unregister the callback once */ + Status = pfnLdrUnregisterDllNotification(Cookie1); + ok_eq_bool(NT_SUCCESS(Status), TRUE); + + /* Unload the test DLL */ + if (FreeLibrary(hTestDll)) + { + /* The count will decrease 1 because the last callback still there */ + ok_eq_long(g_lDllLoadCount, 1L); + } + else + { + skip("FreeLibrary failed with 0x%08lX\n", GetLastError()); + } + + /* Unregister the last callback */ + Status = pfnLdrUnregisterDllNotification(Cookie2); + ok_eq_bool(NT_SUCCESS(Status), TRUE); + +_exit: + DeleteFileW(g_szDllPath); +} diff --git a/modules/rostests/apitests/ntdll/empty_dll/CMakeLists.txt b/modules/rostests/apitests/ntdll/empty_dll/CMakeLists.txt new file mode 100644 index 00000000000..36513ed6703 --- /dev/null +++ b/modules/rostests/apitests/ntdll/empty_dll/CMakeLists.txt @@ -0,0 +1,6 @@ + +add_library(empty_dll MODULE empty_dll.c) +set_module_type(empty_dll win32dll ENTRYPOINT DllMain 12) +add_importlibs(empty_dll kernel32 ntdll) +add_dependencies(empty_dll psdk) +add_rostests_file(TARGET empty_dll) diff --git a/modules/rostests/apitests/ntdll/empty_dll/empty_dll.c b/modules/rostests/apitests/ntdll/empty_dll/empty_dll.c new file mode 100644 index 00000000000..ddd4be786a8 --- /dev/null +++ b/modules/rostests/apitests/ntdll/empty_dll/empty_dll.c @@ -0,0 +1,11 @@ +#include <windows.h> + +BOOL +WINAPI +DllMain( + _In_ HINSTANCE hinstDLL, + _In_ DWORD fdwReason, + _In_ LPVOID lpvReserved) +{ + return TRUE; +} diff --git a/modules/rostests/apitests/ntdll/testdata.rc b/modules/rostests/apitests/ntdll/testdata.rc index 3c16769902c..3937c7302ef 100644 --- a/modules/rostests/apitests/ntdll/testdata.rc +++ b/modules/rostests/apitests/ntdll/testdata.rc @@ -1,2 +1,3 @@ 101 10 "load_notifications.dll" +102 10 "empty_dll.dll" diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 86f653d5adf..c4da00ff0c0 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -3,6 +3,7 @@ #define STANDALONE #include <apitest.h> +extern void func_DllLoadNotification(void); extern void func_LdrEnumResources(void); extern void func_LdrLoadDll(void); extern void func_load_notifications(void); @@ -107,6 +108,7 @@ extern void func_UserModeException(void); const struct test winetest_testlist[] = { + { "DllLoadNotification", func_DllLoadNotification }, { "LdrEnumResources", func_LdrEnumResources }, { "LdrLoadDll", func_LdrLoadDll }, { "load_notifications", func_load_notifications }, diff --git a/sdk/include/ndk/ldrfuncs.h b/sdk/include/ndk/ldrfuncs.h index 62e334aacf7..bdade6abcf9 100644 --- a/sdk/include/ndk/ldrfuncs.h +++ b/sdk/include/ndk/ldrfuncs.h @@ -147,6 +147,23 @@ LdrEnumerateLoadedModules( _In_opt_ PVOID Context ); +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) || (DLL_EXPORT_VERSION >= _WIN32_WINNT_VISTA) + +NTSTATUS +NTAPI +LdrRegisterDllNotification( + _In_ ULONG Flags, + _In_ PLDR_DLL_NOTIFICATION_FUNCTION NotificationFunction, + _In_opt_ PVOID Context, + _Out_ PVOID* Cookie); + +NTSTATUS +NTAPI +LdrUnregisterDllNotification( + _In_ PVOID Cookie); + +#endif /* (_WIN32_WINNT >= _WIN32_WINNT_VISTA) || (DLL_EXPORT_VERSION >= _WIN32_WINNT_VISTA) */ + #ifdef NTOS_MODE_USER NTSYSAPI BOOLEAN diff --git a/sdk/include/ndk/ldrtypes.h b/sdk/include/ndk/ldrtypes.h index 3b71d022887..4c16bd524c1 100644 --- a/sdk/include/ndk/ldrtypes.h +++ b/sdk/include/ndk/ldrtypes.h @@ -37,7 +37,11 @@ Author: // #define LDRP_STATIC_LINK 0x00000002 #define LDRP_IMAGE_DLL 0x00000004 +#if (NTDDI_VERSION < NTDDI_WIN8) #define LDRP_SHIMENG_SUPPRESSED_ENTRY 0x00000008 +#else +#define LDRP_LOAD_NOTIFICATIONS_SENT 0x00000008 +#endif #define LDRP_IMAGE_INTEGRITY_FORCED 0x00000020 #define LDRP_LOAD_IN_PROGRESS 0x00001000 #define LDRP_UNLOAD_IN_PROGRESS 0x00002000 @@ -196,26 +200,39 @@ typedef struct _LDR_ENUM_RESOURCE_INFO // // DLL Notifications // +#define LDR_DLL_NOTIFICATION_REASON_LOADED 1 +#define LDR_DLL_NOTIFICATION_REASON_UNLOADED 2 + typedef struct _LDR_DLL_LOADED_NOTIFICATION_DATA { ULONG Flags; - PUNICODE_STRING FullDllName; - PUNICODE_STRING BaseDllName; + PCUNICODE_STRING FullDllName; + PCUNICODE_STRING BaseDllName; PVOID DllBase; ULONG SizeOfImage; } LDR_DLL_LOADED_NOTIFICATION_DATA, *PLDR_DLL_LOADED_NOTIFICATION_DATA; -typedef VOID -(NTAPI *PLDR_DLL_LOADED_NOTIFICATION_CALLBACK)( - _In_ BOOLEAN Type, - _In_ struct _LDR_DLL_LOADED_NOTIFICATION_DATA *Data -); +typedef struct _LDR_DLL_UNLOADED_NOTIFICATION_DATA +{ + ULONG Flags; + PCUNICODE_STRING FullDllName; + PCUNICODE_STRING BaseDllName; + PVOID DllBase; + ULONG SizeOfImage; +} LDR_DLL_UNLOADED_NOTIFICATION_DATA, *PLDR_DLL_UNLOADED_NOTIFICATION_DATA; -typedef struct _LDR_DLL_LOADED_NOTIFICATION_ENTRY +typedef union _LDR_DLL_NOTIFICATION_DATA { - LIST_ENTRY NotificationListEntry; - PLDR_DLL_LOADED_NOTIFICATION_CALLBACK Callback; -} LDR_DLL_LOADED_NOTIFICATION_ENTRY, *PLDR_DLL_LOADED_NOTIFICATION_ENTRY; + LDR_DLL_LOADED_NOTIFICATION_DATA Loaded; + LDR_DLL_UNLOADED_NOTIFICATION_DATA Unloaded; +} LDR_DLL_NOTIFICATION_DATA, *PLDR_DLL_NOTIFICATION_DATA; +typedef const LDR_DLL_NOTIFICATION_DATA *PCLDR_DLL_NOTIFICATION_DATA; + +typedef VOID +(NTAPI *PLDR_DLL_NOTIFICATION_FUNCTION)( + _In_ ULONG NotificationReason, + _In_ PCLDR_DLL_NOTIFICATION_DATA NotificationData, + _In_opt_ PVOID Context); // // Alternate Resources Support diff --git a/sdk/include/ndk/rtlfuncs.h b/sdk/include/ndk/rtlfuncs.h index c9135cfc909..f506e595c18 100644 --- a/sdk/include/ndk/rtlfuncs.h +++ b/sdk/include/ndk/rtlfuncs.h @@ -39,6 +39,18 @@ extern "C" { // // List Functions // + +DECLSPEC_NORETURN +FORCEINLINE +VOID +RtlFailFast( + _In_ ULONG Code) +{ + __fastfail(Code); +} + +#define RTL_STATIC_LIST_HEAD(x) LIST_ENTRY x = { &x, &x } + FORCEINLINE VOID InitializeListHead( diff --git a/sdk/include/xdk/rtlfuncs.h b/sdk/include/xdk/rtlfuncs.h index 6aeca552d6e..f35b8e28452 100644 --- a/sdk/include/xdk/rtlfuncs.h +++ b/sdk/include/xdk/rtlfuncs.h @@ -22,6 +22,9 @@ $if (_WDMDDK_ || _WINNT_) #define FAST_FAIL_MRDATA_MODIFIED 19 #define FAST_FAIL_INVALID_FAST_FAIL_CODE 0xFFFFFFFF +$endif(_WDMDDK_ || _WINNT_) +$if (_WDMDDK_) + DECLSPEC_NORETURN FORCEINLINE VOID @@ -31,9 +34,6 @@ RtlFailFast( __fastfail(Code); } -$endif(_WDMDDK_ || _WINNT_) -$if (_WDMDDK_) - #if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) && (defined(_M_CEE_PURE) || defined(_M_CEE_SAFE)) #define NO_KERNEL_LIST_ENTRY_CHECKS #endif

4 months

[reactos] 01/01: [EXPLORER] Add Show Desktop button to taskbar customization preview (#7727)

by Miguel Almeida

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6988b4e2c4cfd27cbe700… commit 6988b4e2c4cfd27cbe70066c11b5f9a2112ecea9 Author: Miguel Almeida <miguelbarraalmeida(a)gmail.com> AuthorDate: Sun Mar 2 19:56:30 2025 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 2 20:56:30 2025 +0100 [EXPLORER] Add Show Desktop button to taskbar customization preview (#7727) Use a 4D lookup table for the notification area settings preview, instead of many if cases. CORE-19738 --- base/shell/explorer/explorer.rc | 18 ++++++++++------ base/shell/explorer/res/bmp/184.bmp | Bin 0 -> 12554 bytes base/shell/explorer/res/bmp/185.bmp | Bin 0 -> 12014 bytes base/shell/explorer/res/bmp/186.bmp | Bin 0 -> 12014 bytes base/shell/explorer/res/bmp/187.bmp | Bin 0 -> 12014 bytes base/shell/explorer/res/bmp/188.bmp | Bin 0 -> 12554 bytes base/shell/explorer/res/bmp/189.bmp | Bin 0 -> 12550 bytes base/shell/explorer/resource.h | 18 ++++++++++------ base/shell/explorer/trayprop.cpp | 41 ++++++++++++++++++++++++------------ 9 files changed, 51 insertions(+), 26 deletions(-) diff --git a/base/shell/explorer/explorer.rc b/base/shell/explorer/explorer.rc index c27464aebbc..8cafd263310 100644 --- a/base/shell/explorer/explorer.rc +++ b/base/shell/explorer/explorer.rc @@ -49,15 +49,21 @@ IDB_TASKBARPROP_LOCK_GROUP_NOQL BITMAP "res/bmp/150.bmp" IDB_TASKBARPROP_NOLOCK_GROUP_NOQL BITMAP "res/bmp/151.bmp" IDB_TASKBARPROP_LOCK_NOGROUP_NOQL BITMAP "res/bmp/152.bmp" IDB_TASKBARPROP_NOLOCK_NOGROUP_NOQL BITMAP "res/bmp/153.bmp" -IDB_SYSTRAYPROP_SHOW_SECONDS BITMAP "res/bmp/154.bmp" -IDB_SYSTRAYPROP_HIDE_SECONDS BITMAP "res/bmp/155.bmp" +IDB_SYSTRAYPROP_SHOW_SECONDS_NODESK BITMAP "res/bmp/154.bmp" +IDB_SYSTRAYPROP_HIDE_SECONDS_NODESK BITMAP "res/bmp/155.bmp" IDB_STARTMENU BITMAP "res/bmp/158.bmp" IDB_STARTPREVIEW BITMAP "res/bmp/170.bmp" IDB_STARTPREVIEW_CLASSIC BITMAP "res/bmp/171.bmp" -IDB_SYSTRAYPROP_HIDE_CLOCK BITMAP "res/bmp/180.bmp" -IDB_SYSTRAYPROP_HIDE_NOCLOCK BITMAP "res/bmp/181.bmp" -IDB_SYSTRAYPROP_SHOW_CLOCK BITMAP "res/bmp/182.bmp" -IDB_SYSTRAYPROP_SHOW_NOCLOCK BITMAP "res/bmp/183.bmp" +IDB_SYSTRAYPROP_HIDE_CLOCK_NODESK BITMAP "res/bmp/180.bmp" +IDB_SYSTRAYPROP_HIDE_NOCLOCK_NODESK BITMAP "res/bmp/181.bmp" +IDB_SYSTRAYPROP_SHOW_CLOCK_NODESK BITMAP "res/bmp/182.bmp" +IDB_SYSTRAYPROP_SHOW_NOCLOCK_NODESK BITMAP "res/bmp/183.bmp" +IDB_SYSTRAYPROP_SHOW_SECONDS_DESK BITMAP "res/bmp/184.bmp" +IDB_SYSTRAYPROP_HIDE_SECONDS_DESK BITMAP "res/bmp/185.bmp" +IDB_SYSTRAYPROP_HIDE_CLOCK_DESK BITMAP "res/bmp/186.bmp" +IDB_SYSTRAYPROP_HIDE_NOCLOCK_DESK BITMAP "res/bmp/187.bmp" +IDB_SYSTRAYPROP_SHOW_CLOCK_DESK BITMAP "res/bmp/188.bmp" +IDB_SYSTRAYPROP_SHOW_NOCLOCK_DESK BITMAP "res/bmp/189.bmp" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "explorer.exe.manifest" diff --git a/base/shell/explorer/res/bmp/184.bmp b/base/shell/explorer/res/bmp/184.bmp new file mode 100644 index 00000000000..866e364ab12 Binary files /dev/null and b/base/shell/explorer/res/bmp/184.bmp differ diff --git a/base/shell/explorer/res/bmp/185.bmp b/base/shell/explorer/res/bmp/185.bmp new file mode 100644 index 00000000000..7767600156d Binary files /dev/null and b/base/shell/explorer/res/bmp/185.bmp differ diff --git a/base/shell/explorer/res/bmp/186.bmp b/base/shell/explorer/res/bmp/186.bmp new file mode 100644 index 00000000000..4499898262d Binary files /dev/null and b/base/shell/explorer/res/bmp/186.bmp differ diff --git a/base/shell/explorer/res/bmp/187.bmp b/base/shell/explorer/res/bmp/187.bmp new file mode 100644 index 00000000000..f81efb188cc Binary files /dev/null and b/base/shell/explorer/res/bmp/187.bmp differ diff --git a/base/shell/explorer/res/bmp/188.bmp b/base/shell/explorer/res/bmp/188.bmp new file mode 100644 index 00000000000..7ed2f228ea0 Binary files /dev/null and b/base/shell/explorer/res/bmp/188.bmp differ diff --git a/base/shell/explorer/res/bmp/189.bmp b/base/shell/explorer/res/bmp/189.bmp new file mode 100644 index 00000000000..62a0837fb5e Binary files /dev/null and b/base/shell/explorer/res/bmp/189.bmp differ diff --git a/base/shell/explorer/resource.h b/base/shell/explorer/resource.h index 72b3456270b..d0253e7e9da 100644 --- a/base/shell/explorer/resource.h +++ b/base/shell/explorer/resource.h @@ -39,15 +39,21 @@ #define IDB_TASKBARPROP_NOLOCK_GROUP_NOQL 151 #define IDB_TASKBARPROP_LOCK_NOGROUP_NOQL 152 #define IDB_TASKBARPROP_NOLOCK_NOGROUP_NOQL 153 -#define IDB_SYSTRAYPROP_SHOW_SECONDS 154 -#define IDB_SYSTRAYPROP_HIDE_SECONDS 155 +#define IDB_SYSTRAYPROP_SHOW_SECONDS_NODESK 154 +#define IDB_SYSTRAYPROP_HIDE_SECONDS_NODESK 155 #define IDB_STARTMENU 158 #define IDB_STARTPREVIEW 170 #define IDB_STARTPREVIEW_CLASSIC 171 -#define IDB_SYSTRAYPROP_HIDE_CLOCK 180 -#define IDB_SYSTRAYPROP_HIDE_NOCLOCK 181 -#define IDB_SYSTRAYPROP_SHOW_CLOCK 182 -#define IDB_SYSTRAYPROP_SHOW_NOCLOCK 183 +#define IDB_SYSTRAYPROP_HIDE_CLOCK_NODESK 180 +#define IDB_SYSTRAYPROP_HIDE_NOCLOCK_NODESK 181 +#define IDB_SYSTRAYPROP_SHOW_CLOCK_NODESK 182 +#define IDB_SYSTRAYPROP_SHOW_NOCLOCK_NODESK 183 +#define IDB_SYSTRAYPROP_SHOW_SECONDS_DESK 184 +#define IDB_SYSTRAYPROP_HIDE_SECONDS_DESK 185 +#define IDB_SYSTRAYPROP_HIDE_CLOCK_DESK 186 +#define IDB_SYSTRAYPROP_HIDE_NOCLOCK_DESK 187 +#define IDB_SYSTRAYPROP_SHOW_CLOCK_DESK 188 +#define IDB_SYSTRAYPROP_SHOW_NOCLOCK_DESK 189 /*******************************************************************************\ |* Menu Resources *| diff --git a/base/shell/explorer/trayprop.cpp b/base/shell/explorer/trayprop.cpp index 99983402bc9..875334bf340 100644 --- a/base/shell/explorer/trayprop.cpp +++ b/base/shell/explorer/trayprop.cpp @@ -230,13 +230,14 @@ class CNotifySettingsPage : public CPropertyPageImpl<CNotifySettingsPage> private: HBITMAP m_hbmpTray; HWND m_hwndTaskbar; + static const WORD wImageIdLookupTable[2][2][2][2]; void _UpdateDialog() { BOOL bShowClock = IsDlgButtonChecked(IDC_TASKBARPROP_CLOCK); BOOL bShowSeconds = IsDlgButtonChecked(IDC_TASKBARPROP_SECONDS); BOOL bHideInactive = IsDlgButtonChecked(IDC_TASKBARPROP_HIDEICONS); - UINT uImageId; + BOOL bShowDesktopButton = IsDlgButtonChecked(IDC_TASKBARPROP_DESKTOP); HWND hwndCustomizeNotifyButton = GetDlgItem(IDC_TASKBARPROP_ICONCUST); HWND hwndSeconds = GetDlgItem(IDC_TASKBARPROP_SECONDS); @@ -246,19 +247,7 @@ private: ::EnableWindow(hwndSeconds, bShowClock); if (!bShowSeconds) CheckDlgButton(IDC_TASKBARPROP_SECONDS, BST_UNCHECKED); - - if (bHideInactive && bShowClock && bShowSeconds) - uImageId = IDB_SYSTRAYPROP_HIDE_SECONDS; - else if (bHideInactive && bShowClock && !bShowSeconds) - uImageId = IDB_SYSTRAYPROP_HIDE_CLOCK; - else if (bHideInactive && !bShowClock) - uImageId = IDB_SYSTRAYPROP_HIDE_NOCLOCK; - else if (!bHideInactive && bShowClock && bShowSeconds) - uImageId = IDB_SYSTRAYPROP_SHOW_SECONDS; - else if (!bHideInactive && bShowClock && !bShowSeconds) - uImageId = IDB_SYSTRAYPROP_SHOW_CLOCK; - else if (!bHideInactive && !bShowClock) - uImageId = IDB_SYSTRAYPROP_SHOW_NOCLOCK; + UINT uImageId = wImageIdLookupTable[bShowClock][bShowSeconds][bHideInactive][bShowDesktopButton]; SetBitmap(hwndTrayBitmap, &m_hbmpTray, uImageId); } @@ -324,6 +313,30 @@ public: } }; +const WORD CNotifySettingsPage::wImageIdLookupTable[2][2][2][2] = +{ + { + { + {IDB_SYSTRAYPROP_SHOW_NOCLOCK_NODESK, IDB_SYSTRAYPROP_SHOW_NOCLOCK_DESK}, + {IDB_SYSTRAYPROP_HIDE_NOCLOCK_NODESK, IDB_SYSTRAYPROP_HIDE_NOCLOCK_DESK} + }, + { + {IDB_SYSTRAYPROP_SHOW_NOCLOCK_NODESK, IDB_SYSTRAYPROP_SHOW_NOCLOCK_DESK}, + {IDB_SYSTRAYPROP_HIDE_NOCLOCK_NODESK, IDB_SYSTRAYPROP_HIDE_NOCLOCK_DESK} + } + }, + { + { + {IDB_SYSTRAYPROP_SHOW_CLOCK_NODESK, IDB_SYSTRAYPROP_SHOW_CLOCK_DESK}, + {IDB_SYSTRAYPROP_HIDE_CLOCK_NODESK, IDB_SYSTRAYPROP_HIDE_CLOCK_DESK} + }, + { + {IDB_SYSTRAYPROP_SHOW_SECONDS_NODESK, IDB_SYSTRAYPROP_SHOW_SECONDS_DESK}, + {IDB_SYSTRAYPROP_HIDE_SECONDS_NODESK, IDB_SYSTRAYPROP_HIDE_SECONDS_DESK} + } + } +}; + static int CALLBACK PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) {

4 months

[reactos] 02/02: [FREELDR] Use the `OFF(x)` macro on realmode assembly files

by Daniel Victor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afb96acfdd015f7c07bdc… commit afb96acfdd015f7c07bdc6930d957f5e39ed6749 Author: Daniel Victor <ilauncherdeveloper(a)gmail.com> AuthorDate: Sat Mar 1 17:01:53 2025 -0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 2 19:09:46 2025 +0100 [FREELDR] Use the `OFF(x)` macro on realmode assembly files --- boot/freeldr/freeldr/arch/realmode/amd64.S | 6 +----- boot/freeldr/freeldr/arch/realmode/i386.S | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/boot/freeldr/freeldr/arch/realmode/amd64.S b/boot/freeldr/freeldr/arch/realmode/amd64.S index 2c4f19b6c6b..b1e88af37d6 100644 --- a/boot/freeldr/freeldr/arch/realmode/amd64.S +++ b/boot/freeldr/freeldr/arch/realmode/amd64.S @@ -116,11 +116,7 @@ gdt: /* GDT table pointer */ gdtptr: .word HEX(37) /* Limit */ -#ifdef _USE_ML - .long offset gdt /* Base Address */ -#else - .long gdt /* Base Address */ -#endif + .long OFF(gdt) /* Base Address */ CheckFor64BitSupport: diff --git a/boot/freeldr/freeldr/arch/realmode/i386.S b/boot/freeldr/freeldr/arch/realmode/i386.S index d2bcd7b9288..fdac4e52932 100644 --- a/boot/freeldr/freeldr/arch/realmode/i386.S +++ b/boot/freeldr/freeldr/arch/realmode/i386.S @@ -191,7 +191,7 @@ gdt: /* GDT table pointer */ gdtptr: .word HEX(27) /* Limit */ - .word gdt, 0 /* Base Address */ + .long OFF(gdt) /* Base Address */ /* Real-mode IDT pointer */ rmode_idtptr:

4 months

[reactos] 01/02: [ASM] Move `OFF(x)` macro from `asmxtras.inc` to `asm.inc`

by Daniel Victor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c5efed7da4716980ca67… commit 9c5efed7da4716980ca678576bbf994e908c7228 Author: Daniel Victor <ilauncherdeveloper(a)gmail.com> AuthorDate: Fri Feb 28 17:39:13 2025 -0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 2 19:09:46 2025 +0100 [ASM] Move `OFF(x)` macro from `asmxtras.inc` to `asm.inc` --- sdk/include/asm/asm.inc | 6 ++++++ subsystems/mvdm/dos/asmxtras.inc | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sdk/include/asm/asm.inc b/sdk/include/asm/asm.inc index 062b622619b..d5e4bc98818 100644 --- a/sdk/include/asm/asm.inc +++ b/sdk/include/asm/asm.inc @@ -172,6 +172,9 @@ ENDM .skip size, fill ENDM +/* OFFset macro */ +#define OFF(x) offset x + #define lXdtPrefix fword ptr ljmp MACRO segment, offset @@ -324,6 +327,9 @@ ENDM #define REPEAT .rept #define ENDR .endr +/* OFFset macro */ +#define OFF(x) x + #define lXdtPrefix .macro ljmp segment, offset diff --git a/subsystems/mvdm/dos/asmxtras.inc b/subsystems/mvdm/dos/asmxtras.inc index e9b97e9e07c..a02fbc892c8 100644 --- a/subsystems/mvdm/dos/asmxtras.inc +++ b/subsystems/mvdm/dos/asmxtras.inc @@ -27,13 +27,6 @@ #define DWORD long #endif -/* OFFset macro */ -#ifdef _USE_ML - #define OFF(x) offset x -#else - #define OFF(x) x -#endif - /* * Set of macros for defining and using structures: * - STRUCT(name, ...) defines a structure of name 'name'.

4 months

[reactos] 01/01: [UNIATA] Fix memory corruption if SCSIOP_SERVICE_ACTION16 processed. (#7717)

by Max Korostil

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=606e996e1fcfe9f358a1e… commit 606e996e1fcfe9f358a1e77f6da71bfbd845b6c6 Author: Max Korostil <mrmks04(a)yandex.ru> AuthorDate: Sun Mar 2 21:07:34 2025 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 2 19:07:34 2025 +0100 [UNIATA] Fix memory corruption if SCSIOP_SERVICE_ACTION16 processed. (#7717) Reason: the size of `READ_CAPACITY16_DATA` struct in UniATA driver and ReactOS/Windows SDK were not equal. - In UniATA driver: `sizeof(READ_CAPACITY16_DATA) == 33` (wrong); - In ReactOS/Windows SDK: `sizeof(READ_CAPACITY16_DATA) == 32` (correct). CORE-19696 --- drivers/storage/ide/uniata/scsi.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/storage/ide/uniata/scsi.h b/drivers/storage/ide/uniata/scsi.h index 9d85cf14d59..9a599114da3 100644 --- a/drivers/storage/ide/uniata/scsi.h +++ b/drivers/storage/ide/uniata/scsi.h @@ -1433,7 +1433,13 @@ typedef struct _READ_CAPACITY16_DATA { UCHAR Prot_EN:1; UCHAR RTO_EN:1; UCHAR Reserved:6; +#ifdef __REACTOS__ + /* In ReactOS SDK sizeof(READ_CAPACITY16_DATA) == 32. + * Fixes CORE-19696 memory corruption on SCSIOP_SERVICE_ACTION16. */ + UCHAR Reserved1[19]; +#else UCHAR Reserved1[20]; +#endif } READ_CAPACITY16_DATA, *PREAD_CAPACITY16_DATA; // CD ROM Read Table Of Contents (TOC) structures

4 months

[reactos] 01/01: [DXDIAG] Update Romanian (ro-RO) translation (#7359)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e36c669d97dea01a6b4ec… commit e36c669d97dea01a6b4ec26e1bed410f18e0d89e Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Mar 2 18:33:34 2025 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 2 17:33:34 2025 +0100 [DXDIAG] Update Romanian (ro-RO) translation (#7359) Improvements based on recent Romanian translation document revision 06e89b2. This file was not translated in Romanian language in any Win version (neither XP/2k3+, nor in the previous ones). I tried to translate this file as close as possible in the way I did in the previous PRs. --- base/applications/dxdiag/lang/ro-RO.rc | 150 ++++++++++++++++----------------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/base/applications/dxdiag/lang/ro-RO.rc b/base/applications/dxdiag/lang/ro-RO.rc index 2e57b0806d1..92755011343 100644 --- a/base/applications/dxdiag/lang/ro-RO.rc +++ b/base/applications/dxdiag/lang/ro-RO.rc @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com> - * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> + * Copyright 2023-2025 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -11,22 +11,22 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDD_MAIN_DIALOG DIALOGEX 0, 0, 478, 280 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Diagnostic ReactX" +CAPTION "Instrument de diagnosticare ReactX" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 - PUSHBUTTON "&Manual…", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED - DEFPUSHBUTTON "&Următorul compartiment", IDC_BUTTON_NEXT, 187, 260, 120, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "S&alvare informații…", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Î&nchide", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Ajutor", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED + DEFPUSHBUTTON "&Pagina următoare", IDC_BUTTON_NEXT, 187, 260, 120, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Salvare a tuturor informațiilor…", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Î&nchidere", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Acest instrument oferă informații detaliate despre componentele ReactX și drivere instalate în sistem.", IDC_STATIC, 5, 0, 443, 17 - LTEXT "Dacă aveți la cunoștință careva probleme la o anumită categorie, mergeți la compartimentul corespunzător de mai sus. Altfel, puteți utiliza butonul „Următorul compartiment” de mai jos pentru a trece secvențial prin fiecare categorie.", IDC_STATIC, 5, 15, 443, 25 + LTEXT "Acest instrument raportează informații detaliate despre componentele ReactX și driverele instalate pe sistem.", IDC_STATIC, 5, 0, 443, 17 + LTEXT "Dacă întâmpinați o problemă cu ReactX și știți ce este, atunci faceți clic pe fila corespunzătoare de mai sus. Dacă nu, puteți face clic pe butonul ""Pagina următoare"" de mai jos pentru a vizita fiecare pagină în succesiune.", IDC_STATIC, 5, 15, 443, 25 GROUPBOX "Informații despre sistem", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT LTEXT "Data/Ora curentă:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT LTEXT "Numele calculatorului:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT @@ -60,11 +60,11 @@ BEGIN GROUPBOX "Dispozitiv", IDC_STATIC, 5, 0, 250, 95 RTEXT "Nume:", IDC_STATIC, 20, 10, 70, 10 RTEXT "Producător:", IDC_STATIC, 20, 20, 70, 10 - RTEXT "Tipul cipului:", IDC_STATIC, 20, 30, 70, 10 - RTEXT "Tipul CDA:", IDC_STATIC, 20, 40, 70, 10 - RTEXT "Memorie aprox.:", IDC_STATIC, 20, 50, 70, 10 - RTEXT "Afișare curentă:", IDC_STATIC, 20, 60, 70, 10 - RTEXT "Ecran:", IDC_STATIC, 20, 70, 70, 10 + RTEXT "Tipul chip-ului:", IDC_STATIC, 20, 30, 70, 10 + RTEXT "Tipul DAC:", IDC_STATIC, 20, 40, 70, 10 + RTEXT "Mem. tot. aprox.:", IDC_STATIC, 20, 50, 70, 10 + RTEXT "Mod afișare curentă:", IDC_STATIC, 20, 60, 70, 10 + RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10 EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -73,10 +73,10 @@ BEGIN EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Driver", IDC_STATIC, 260, 0, 197, 95 - RTEXT "Driver primar:", IDC_STATIC, 275, 10, 55, 10 + RTEXT "Driver principal:", IDC_STATIC, 275, 10, 55, 10 RTEXT "Versiune:", IDC_STATIC, 275, 20, 55, 10 RTEXT "Dată:", IDC_STATIC, 275, 30, 55, 10 - RTEXT "Semnăt. WHQL:", IDC_STATIC, 275, 40, 55, 10 + RTEXT "Logo WHQL:", IDC_STATIC, 275, 40, 55, 10 RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10 RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10 RTEXT "Versiune DDI:", IDC_STATIC, 275, 70, 55, 10 @@ -87,18 +87,18 @@ BEGIN EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - GROUPBOX "Funcționalități ReactX", IDC_STATIC, 5, 97, 452, 70 + GROUPBOX "Caracteristici ReactX", IDC_STATIC, 5, 97, 452, 70 RTEXT "Accelerare DirectDraw:", IDC_STATIC, 15, 115, 110, 12 RTEXT "Accelerare Direct3D:", IDC_STATIC, 15, 130, 110, 12 - RTEXT "Accelerare Textură AGP:", IDC_STATIC, 15, 145, 110, 12 + RTEXT "Accelerare a texturilor AGP:", IDC_STATIC, 15, 145, 110, 12 LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10 LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10 LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10 - PUSHBUTTON "Activează", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED - PUSHBUTTON "Activează", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED - PUSHBUTTON "Activează", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED - PUSHBUTTON "Testează DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14 - PUSHBUTTON "Testează Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14 + PUSHBUTTON "Activare", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED + PUSHBUTTON "Activare", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED + PUSHBUTTON "Activare", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED + PUSHBUTTON "Testare DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14 + PUSHBUTTON "Testare Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14 GROUPBOX "Note", IDC_STATIC, 5, 170, 452, 50 EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP END @@ -124,7 +124,7 @@ BEGIN RTEXT "Nume:", IDC_STATIC, 275, 10, 55, 10 RTEXT "Versiune:", IDC_STATIC, 275, 20, 55, 10 RTEXT "Dată:", IDC_STATIC, 275, 30, 55, 10 - RTEXT "Semnătură WHQL:", IDC_STATIC, 275, 40, 55, 10 + RTEXT "Logo WHQL:", IDC_STATIC, 275, 40, 55, 10 RTEXT "Alte fișiere:", IDC_STATIC, 275, 50, 55, 10 RTEXT "Furnizor:", IDC_STATIC, 275, 60, 55, 10 EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -133,10 +133,10 @@ BEGIN EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - GROUPBOX "Funcționalități ReactX", IDC_STATIC, 5, 97, 452, 70 + GROUPBOX "Caracteristici ReactX", IDC_STATIC, 5, 97, 452, 70 CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17 - RTEXT "Echipament de sunet\nNivel de accelerare::", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED - PUSHBUTTON "Testează DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED + RTEXT "Hardware de sunet\nNivel de accelerare:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED + PUSHBUTTON "Testare DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED GROUPBOX "Note", IDC_STATIC, 5, 170, 452, 50 EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP END @@ -148,13 +148,13 @@ BEGIN RTEXT "Colecție de MIDI DLS generală:", IDC_STATIC, 0, 0, 100, 10 EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Porturi de muzică", IDC_STATIC, 5, 10, 452, 85 - GROUPBOX "Funcționalități ReactX", IDC_STATIC, 5, 97, 452, 70 + GROUPBOX "Caracteristici ReactX", IDC_STATIC, 5, 97, 452, 70 LTEXT "Port de accelerare implicit:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 PUSHBUTTON "Dezactivează", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED LTEXT "Testare utilizare port:", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Testează DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED + PUSHBUTTON "Testare DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED GROUPBOX "Note", IDC_STATIC, 5, 170, 452, 50 EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP END @@ -176,12 +176,12 @@ IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Furnizori înregistrați de servicii DirectPlay", IDC_STATIC, 5, 0, 452, 75 + GROUPBOX "Furnizori de servicii DirectPlay înregistrați", IDC_STATIC, 5, 0, 452, 75 CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55 - GROUPBOX "Aplicații înregistrate pentru DirectPlay", IDC_STATIC, 5, 77, 452, 55 - GROUPBOX "Funcționalități ReactX", IDC_STATIC, 5, 133, 452, 35 + GROUPBOX "Aplicații Lobbyable DirectPlay înregistrate", IDC_STATIC, 5, 77, 452, 55 + GROUPBOX "Caracteristici ReactX", IDC_STATIC, 5, 133, 452, 35 PUSHBUTTON "Opțiuni de voce DirectPlay", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED - PUSHBUTTON "Testează DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED + PUSHBUTTON "Testare DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED GROUPBOX "Note", IDC_STATIC, 5, 170, 452, 50 EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP END @@ -190,73 +190,73 @@ IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Încă nu ați găsit informația necesară? Iată câteva lucruri suplimentare pe care le puteți face:", IDC_STATIC, 5, 0, 300, 10 + LTEXT "Încă nu găsiți informațiile pe care le căutați? Iată câteva lucruri suplimentare pe care le puteți face:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "Informații de sistem", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Afișează informații suplimantare de sistem", IDC_STATIC, 90, 23, 300, 10 - PUSHBUTTON "Ajustează rata de împrospătare", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Ajustează rata de împrospătare pentru DirectDraw", IDC_STATIC, 90, 43, 300, 10 + LTEXT "Afișează informații suplimentare de sistem", IDC_STATIC, 90, 23, 300, 10 + PUSHBUTTON "Ajust. rata de împrosp.", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED + LTEXT "Ignoră rata de reîmprospătare pentru DirectDraw", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE BEGIN - IDS_MAIN_DIALOG "Diagnostic ReactX" + IDS_MAIN_DIALOG "Instrument de diagnosticare ReactX" IDS_SYSTEM_DIALOG "Sistem" - IDS_DISPLAY_DIALOG "Ecran" + IDS_DISPLAY_DIALOG "Afișaj" IDS_SOUND_DIALOG "Sunet" IDS_MUSIC_DIALOG "Muzică" - IDS_INPUT_DIALOG "Intrări" + IDS_INPUT_DIALOG "Intrare" IDS_NETWORK_DIALOG "Rețea" - IDS_HELP_DIALOG "Asistență" - IDS_FORMAT_MB "%I64u Mo memorie" - IDS_FORMAT_SWAP "%I64u Mo utilizată, %I64u Mo disponibilă" - IDS_FORMAT_UNIPROC "%s (%u procesor)" - IDS_FORMAT_MPPROC "%s (%u procesoare)" - IDS_VERSION_UNKNOWN "Versiune neidentificată" + IDS_HELP_DIALOG "Ajutor" + IDS_FORMAT_MB "%I64uMB de RAM" + IDS_FORMAT_SWAP "%I64u (de) MB folosit (folosiți), %I64u (de) MB disponibil(i)" + IDS_FORMAT_UNIPROC "%s (%u CPU)" + IDS_FORMAT_MPPROC "%s (%u CPUs)" + IDS_VERSION_UNKNOWN "Versiune necunoscută" IDS_DEVICE_STATUS_ATTACHED "Conectat" IDS_DEVICE_STATUS_MISSING "Deconectat" - IDS_DEVICE_STATUS_UNKNOWN "Neidentificat" - IDS_DEVICE_NAME "Nume dispozitiv" + IDS_DEVICE_STATUS_UNKNOWN "Necunoscut" + IDS_DEVICE_NAME "Numele dispozitivului" IDS_DEVICE_STATUS "Stare" - IDS_DEVICE_CONTROLLER "ID controlor" - IDS_DEVICE_MANUFACTURER "ID producător" - IDS_DEVICE_PRODUCT "ID produs" - IDS_DEVICE_FORCEFEEDBACK "Forțează reacția driverului" + IDS_DEVICE_CONTROLLER "ID controller-ului" + IDS_DEVICE_MANUFACTURER "ID-ul producătorului" + IDS_DEVICE_PRODUCT "ID-ul produsului" + IDS_DEVICE_FORCEFEEDBACK "Forțare a driverului de feedback" IDS_NOT_APPLICABLE "n/a" IDS_OPTION_YES "Da" IDS_DIRECTPLAY_COL_NAME1 "Nume" IDS_DIRECTPLAY_COL_NAME2 "Registru" IDS_DIRECTPLAY_COL_NAME3 "Fișier" IDS_DIRECTPLAY_COL_NAME4 "Versiune" - IDS_DIRECTPLAY8_MODEMSP "Furnizor de serviciu Modem-DirectPlay8" - IDS_DIRECTPLAY8_SERIALSP "Furnizor de serviciu Serial-DirectPlay8" - IDS_DIRECTPLAY8_IPXSP "Furnizor de serviciu IPX-DirectPlay8" - IDS_DIRECTPLAY8_TCPSP "Furnizor de serviciu TCP/IP-DirectPlay8" + IDS_DIRECTPLAY8_MODEMSP "Furnizor de servicii de modem DirectPlay8" + IDS_DIRECTPLAY8_SERIALSP "Furnizor de servicii seriale DirectPlay8" + IDS_DIRECTPLAY8_IPXSP "Furnizor de servicii DirectPlay8 IPX" + IDS_DIRECTPLAY8_TCPSP "DirectPlay8 TCP/IP Service Provider" IDS_DIRECTPLAY_TCPCONN "Conexiune de Internet TCP/IP pentru DirectPlay" IDS_DIRECTPLAY_IPXCONN "Conexiune IPX pentru DirectPlay" - IDS_DIRECTPLAY_MODEMCONN "Conexiune Modem pentru DirectPlay" - IDS_DIRECTPLAY_SERIALCONN "Conexiune Serială pentru DirectPlay" - IDS_REG_SUCCESS "Î&nchide" + IDS_DIRECTPLAY_MODEMCONN "Conexiune de modem pentru DirectPlay" + IDS_DIRECTPLAY_SERIALCONN "Conexiune serială pentru DirectPlay" + IDS_REG_SUCCESS "OK" IDS_REG_FAIL "Eroare" - IDS_DDTEST_ERROR "Testul a eșuat!" - IDS_DDTEST_DESCRIPTION "Urmează testele de interfață DirectDraw. Continuați?" - IDS_DDPRIMARY_DESCRIPTION "Testul următor va utiliza DirectDraw pentru a desena dreptunghiuri albe și negre pe suprafața primară. Continuați?" - IDS_DDPRIMARY_RESULT "Dreptunghiurile albe și negre au fost vizibile?" - IDS_DDOFFSCREEN_DESCRIPTION "Testul următor va utiliza DirectDraw pentru desenarea unui dreptunghi alb în mișcare utilizând o memorie tampon din afara ecranului. Continuați?" - IDS_DDOFFSCREEN_RESULT "Dreptunghiul alb în mișcare a fost vizibil?" - IDS_DDFULLSCREEN_DESCRIPTION "Testul următor va utiliza DirectDraw pentru desenarea unui dreptunghi alb în mișcare utilizând tot ecranul. Continuați?" - IDS_DDFULLSCREEN_RESULT "Pe ecranul complet, dreptunghiul alb în mișcare a fost vizibil?" - IDS_FORMAT_ADAPTER_MEM "%u Mo" - IDS_FORMAT_ADAPTER_MODE "%d x %d (%u biți)(%uHz)" + IDS_DDTEST_ERROR "Testul de randare DirectDraw a eșuat.\nVă rugăm să consultați notele pentru mai multe informații." + IDS_DDTEST_DESCRIPTION "Acesta va porni testarea interfeței DirectDraw. Doriți să continuați?" + IDS_DDPRIMARY_DESCRIPTION "Acest test va folosi DirectDraw pentru a desena pe suprafața principală.\Ar trebui desenate dreptunghiuri alb-negru. Doriți să continuați?" + IDS_DDPRIMARY_RESULT "Ați văzut dreptunghiuri alb-negru?" + IDS_DDOFFSCREEN_DESCRIPTION "Acest test va folosi DirectDraw pentru a desena un tampon în afara ecranului. Ar trebui desenat un dreptunghi alb în mișcare. Doriți să continuați?" + IDS_DDOFFSCREEN_RESULT "Ați văzut dreptunghi alb în mișcare?" + IDS_DDFULLSCREEN_DESCRIPTION "Acest test va folosi DirectDraw pentru a desena în modul ecran complet. Ar trebui desenat un dreptunghi alb în mișcare. Doriți să continuați?" + IDS_DDFULLSCREEN_RESULT "Ați văzut dreptunghi alb în mișcare în modul ecran complet?" + IDS_FORMAT_ADAPTER_MEM "%u (de) MB" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u (de) biți)(%uHz)" IDS_OPTION_NO "Nu" - IDS_D3DTEST_DESCRIPTION "Urmează testul de interfață Direct3D. Continuați?" - IDS_D3DTEST_D3Dx "Testul următor va utiliza interfața Direct3D %u cu accelerare de echipament fizic." - IDS_OS_VERSION "%s %s (%d.%d, Build %d)" + IDS_D3DTEST_DESCRIPTION "Acesta va porni testarea interfeței Direct3D. Doriți să continuați?" + IDS_D3DTEST_D3Dx "Acest test va folosi interfața Direct3D %u accelerată hardware." + IDS_OS_VERSION "%s %s (%d.%d, Subversiunea %d)" IDS_DMUSIC_DESC "Descriere" IDS_DMUSIC_TYPE "Tip" - IDS_DMUSIC_KERNEL "Mod nucleu" - IDS_DMUSIC_IO "In/Ex" - IDS_DMUSIC_DLS "DLS de suport" + IDS_DMUSIC_KERNEL "Modul nucleu" + IDS_DMUSIC_IO "I/E" + IDS_DMUSIC_DLS "Suportă DLS" IDS_DMUSIC_EXT "Extern" IDS_DMUSIC_PORT "Port implicit" - IDS_DDDISABLE_MSG "Accelerările fizice DirectDraw vor fi dezactivate pentru toate dispozitivele.\nDoriți să continuați?\n" + IDS_DDDISABLE_MSG "Acesta va dezactiva toată accelerarea hardware pentru DirectDraw pe toate dispozitivele de afișare.\nDoriți să continuați?\n" END

4 months

[reactos] 01/01: [BOOTDATA][NETSHELL][INF] Improvements to the network setup

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da5192e622fb6f7f49176… commit da5192e622fb6f7f4917699ea27c1fd8d17b067d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 2 15:07:09 2025 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 2 15:07:36 2025 +0100 [BOOTDATA][NETSHELL][INF] Improvements to the network setup - Fix the network setup wizard start page. - Add the ndisuio driver to the network setup. - Remove the tcpip driver from the system setup. --- boot/bootdata/hivesys.inf | 7 ----- dll/shellext/netshell/setup.cpp | 38 ++++++++++++++++++++------ media/inf/CMakeLists.txt | 1 + media/inf/ndisuio.inf | 60 +++++++++++++++++++++++++++++++++++++++++ media/inf/syssetup.inf | 1 - 5 files changed, 91 insertions(+), 16 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index bcd2bda1e16..1febd390b14 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1735,13 +1735,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","ImagePath",0x00020000,"system HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","Type",0x00010001,0x00000001 -; NDIS User I/O driver (FIXME: Should be installed via INF and started on demand) -HKLM,"SYSTEM\CurrentControlSet\Services\Ndisuio","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Ndisuio","Group",0x00000000,"NDIS" -HKLM,"SYSTEM\CurrentControlSet\Services\Ndisuio","ImagePath",0x00020000,"system32\drivers\ndisuio.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Ndisuio","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Ndisuio","Type",0x00010001,0x00000001 - ; Packet driver HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Group",0x00000000,"PNP_TDI" diff --git a/dll/shellext/netshell/setup.cpp b/dll/shellext/netshell/setup.cpp index eb469c82b3a..e2027fd5219 100644 --- a/dll/shellext/netshell/setup.cpp +++ b/dll/shellext/netshell/setup.cpp @@ -23,10 +23,21 @@ typedef struct _NETWORKSETUPDATA HWND hwndPage; } NETWORKSETUPDATA, *PNETWORKSETUPDATA; - extern "C" { +typedef struct _NETWORKCOMPONENT +{ + LPWSTR pszDeviceId; + const GUID *pClassGuid; +} NETWORKCOMPONENT, PNETWORKCOMPONENT; + +static NETWORKCOMPONENT NetworkComponents[] = { + {(LPWSTR)L"MS_TCPIP", &GUID_DEVCLASS_NETTRANS}, + {(LPWSTR)L"MS_NDISUIO", &GUID_DEVCLASS_NETTRANS} +}; + + static VOID SetBoldText( @@ -52,7 +63,7 @@ InstallNetworkComponent( OBO_TOKEN OboToken; HRESULT hr; - TRACE("InstallNetworkComponent()\n"); + TRACE("InstallNetworkComponent(%S)\n", pszComponentName); hr = CoInitialize(NULL); if (hr != S_OK) @@ -169,16 +180,23 @@ InstallThreadProc( _In_ LPVOID lpParameter) { PNETWORKSETUPDATA pNetworkSetupData = (PNETWORKSETUPDATA)lpParameter; + UINT i, count; TRACE("InstallThreadProc()\n"); - SendDlgItemMessage(pNetworkSetupData->hwndPage, IDC_INSTALL_PROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, 1)); - SendDlgItemMessage(pNetworkSetupData->hwndPage, IDC_INSTALL_PROGRESS, PBM_SETPOS, 0, 0); + count = sizeof(NetworkComponents) / sizeof(NETWORKCOMPONENT); + TRACE("Network Components: %u\n", count); - InstallNetworkComponent((LPWSTR)L"MS_TCPIP", &GUID_DEVCLASS_NETTRANS); - SendDlgItemMessage(pNetworkSetupData->hwndPage, IDC_INSTALL_PROGRESS, PBM_SETPOS, 1, 0); + SendDlgItemMessage(pNetworkSetupData->hwndPage, IDC_INSTALL_PROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, count)); + SendDlgItemMessage(pNetworkSetupData->hwndPage, IDC_INSTALL_PROGRESS, PBM_SETPOS, 0, 0); - Sleep(500); + for (i = 0; i < count; i++) + { + TRACE("Install Network Component: %S\n", NetworkComponents[i].pszDeviceId); + InstallNetworkComponent(NetworkComponents[i].pszDeviceId, NetworkComponents[i].pClassGuid); + SendDlgItemMessage(pNetworkSetupData->hwndPage, IDC_INSTALL_PROGRESS, PBM_SETPOS, i, 0); + Sleep(500); + } TRACE("Done\n"); @@ -548,11 +566,14 @@ NetSetupRequestWizardPages( DWORD dwPageCount = 4; INT nPage = 0; + TRACE("NetSetupRequestWizardPages(%p %p %p)\n", pPageCount, pPages, pSetupData); + if (pPageCount == NULL) return ERROR_INVALID_PARAMETER; if (pPages == NULL) { + TRACE("Return %lu pages\n", dwPageCount); *pPageCount = dwPageCount; return ERROR_SUCCESS; } @@ -560,7 +581,7 @@ NetSetupRequestWizardPages( if (*pPageCount < dwPageCount) return ERROR_BUFFER_OVERFLOW; - pSetupData->uFirstNetworkWizardPage = IDD_NETWORKSETTINGSPAGE; + pSetupData->uFirstNetworkWizardPage = IDD_NETWORKINITPAGE; pNetworkSetupData = (PNETWORKSETUPDATA)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NETWORKSETUPDATA)); if (pNetworkSetupData == NULL) @@ -604,6 +625,7 @@ NetSetupRequestWizardPages( psp.pszTemplate = MAKEINTRESOURCE(IDD_NETWORKDOMAINPAGE); pPages[nPage++] = CreatePropertySheetPage(&psp); + TRACE("Return %lu pages\n", dwPageCount); *pPageCount = dwPageCount; return ERROR_SUCCESS; diff --git a/media/inf/CMakeLists.txt b/media/inf/CMakeLists.txt index 3d67b82f841..054f64c0180 100644 --- a/media/inf/CMakeLists.txt +++ b/media/inf/CMakeLists.txt @@ -18,6 +18,7 @@ list(APPEND INF_FILES machine.inf monitor.inf msmouse.inf + ndisuio.inf NET_NIC.inf nettcpip.inf ports.inf diff --git a/media/inf/ndisuio.inf b/media/inf/ndisuio.inf new file mode 100644 index 00000000000..0439cfb7006 --- /dev/null +++ b/media/inf/ndisuio.inf @@ -0,0 +1,60 @@ +; NDISUIO.INF + +; Installation file for the NDIS Usermode I/O Protocol + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = NetTrans +ClassGUID = {4D36E975-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 04/12/2006,1.00 + +[Manufacturer] +%ReactOS% = ReactOS + +[ReactOS] +%NDISUIO_DisplayName% = Install, MS_NDISUIO + +;--------------------------- NDISUIO DRIVER ----------------------------- + +[Install] +Characteristics = 0x28 +AddReg = Inst_Ndi +CopyFiles = CopyFiles_Sys + +[Inst_Ndi.NT] +HKR,"Ndi","HelpText",0x00000000,"%NDISUIO_HelpText%" +HKR,"Ndi","Service",0x00000000,"Ndisuio" +HKR,"Ndi\Interfaces","UpperRange",0x00000000,"noupper" +HKR,"Ndi\Interfaces","LowerRange",0x00000000,"ndis4,ndis5" + +[Install.Services] +AddService = Ndisuio, , NDISUIO_Service_Inst + +[NDISUIO_Service_Inst] +DisplayName = "%NDISUIO_DisplayName%" +Description = "%NDISUIO_DisplayName%" +ServiceType = 1 +StartType = 1 +ErrorControl = 1 +ServiceBinary = %12%\ndisuio.sys +LoadOrderGroup = NDIS + +[CopyFiles_Sys] +ndisuio.sys + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +; Non-localizable +ReactOS = "ReactOS Project" + +; Localizable +NDISUIO_DisplayName = "NDIS Usermode I/O Protocol" +NDISUIO_HelpText = "A driver that supports the NDIS Usermode I/O Protocol." + +[Strings.0409] +NDISUIO_DisplayName = "NDIS Benutzermodus E/A Protokoll" +NDISUIO_HelpText = "Ein Treiber, der das NDIS Benutzermodus E/A Protokoll unterstützt." diff --git a/media/inf/syssetup.inf b/media/inf/syssetup.inf index 1ef4a04bc3d..5f12090cba1 100644 --- a/media/inf/syssetup.inf +++ b/media/inf/syssetup.inf @@ -20,7 +20,6 @@ machine.inf monitor.inf msmouse.inf NET_NIC.inf -nettcpip.inf ports.inf scsi.inf unknown.inf

4 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2025