Ros-diffs May 2022

ros-diffs@reactos.org

31 participants
165 discussions

[reactos] 02/03: [MINIHAL] Compile with _NTSYSTEM_ since it's also part of the bootloader.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=39b8d4559292dc86e1987… commit 39b8d4559292dc86e1987042c55bff04487d59e0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 8 03:06:27 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 8 04:15:51 2022 +0200 [MINIHAL] Compile with _NTSYSTEM_ since it's also part of the bootloader. Fixes compilation because the Hal(Private)DispatchTable's, defined in the bootloader's NTOS stub, are not external imports, as they would be for a standard HAL. --- hal/halx86/minihal/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hal/halx86/minihal/CMakeLists.txt b/hal/halx86/minihal/CMakeLists.txt index e8300e7bc56..32d510f2a8b 100644 --- a/hal/halx86/minihal/CMakeLists.txt +++ b/hal/halx86/minihal/CMakeLists.txt @@ -46,6 +46,6 @@ endif() add_asm_files(mini_hal_asm ../generic/systimer.S) add_library(mini_hal ${MINI_HAL_SOURCE} ${mini_hal_asm}) -target_compile_definitions(mini_hal PRIVATE _BLDR_ _MINIHAL_) +target_compile_definitions(mini_hal PRIVATE _MINIHAL_ _BLDR_ _NTSYSTEM_) add_dependencies(mini_hal psdk bugcodes asm) add_pch(mini_hal ../include/hal.h MINI_HAL_SOURCE)

2 years, 7 months

[reactos] 01/03: [FREELDR] Remove unnecessary includes and deprecated defines.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec1def3f313566fd60d85… commit ec1def3f313566fd60d858f31c68403b9e1b50f4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 8 04:47:09 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 8 04:15:43 2022 +0200 [FREELDR] Remove unnecessary includes and deprecated defines. --- boot/freeldr/freeldr/arch/i386/halstub.c | 2 -- boot/freeldr/freeldr/disk/scsiport.c | 1 - boot/freeldr/freeldr/include/ntoskrnl.h | 4 ---- 3 files changed, 7 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/halstub.c b/boot/freeldr/freeldr/arch/i386/halstub.c index 6a43d5e2871..6aa39655f72 100644 --- a/boot/freeldr/freeldr/arch/i386/halstub.c +++ b/boot/freeldr/freeldr/arch/i386/halstub.c @@ -10,8 +10,6 @@ #include <ntoskrnl.h> -#include <debug.h> - /* FUNCTIONS *****************************************************************/ NTSTATUS diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index 0699f69f6a6..c41d7936f80 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -15,7 +15,6 @@ DBG_DEFAULT_CHANNEL(SCSIPORT); #define _SCSIPORT_ -#include <ntddk.h> #include <srb.h> #include <scsi.h> #include <ntddscsi.h> diff --git a/boot/freeldr/freeldr/include/ntoskrnl.h b/boot/freeldr/freeldr/include/ntoskrnl.h index a514f133e79..c88c5e55eba 100644 --- a/boot/freeldr/freeldr/include/ntoskrnl.h +++ b/boot/freeldr/freeldr/include/ntoskrnl.h @@ -8,8 +8,6 @@ #include <ntdef.h> #undef _NTHAL_ -//#undef DECLSPEC_IMPORT -//#define DECLSPEC_IMPORT #undef NTSYSAPI #define NTSYSAPI @@ -17,8 +15,6 @@ #include <ntddk.h> #include <ndk/haltypes.h> -//typedef GUID UUID; - /* Disk stuff */ #include <arc/arc.h> #include <ntdddisk.h>

2 years, 7 months

[reactos] 01/01: [DRIVERS] Add some missing OBJ_KERNEL_HANDLE (#4493)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46db6573ab98b87e6b684… commit 46db6573ab98b87e6b68484e3b5db0e80159719f Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat May 7 21:12:19 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat May 7 22:12:19 2022 +0300 [DRIVERS] Add some missing OBJ_KERNEL_HANDLE (#4493) Match Zw*() uses. CORE-10207 --- drivers/filesystems/fs_rec/fs_rec.c | 2 +- drivers/filesystems/udfs/Include/regtools.cpp | 3 +-- drivers/filesystems/udfs/udfinit.cpp | 2 +- drivers/ksfilter/ks/connectivity.c | 3 +-- drivers/ksfilter/ks/image.c | 5 +---- drivers/serial/serial/pnp.c | 2 +- drivers/wdm/audio/legacy/wdmaud/mmixer.c | 2 +- drivers/wdm/audio/legacy/wdmaud/sup.c | 4 ++-- 8 files changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/filesystems/fs_rec/fs_rec.c b/drivers/filesystems/fs_rec/fs_rec.c index 4ccb99f5952..e350fac5ceb 100644 --- a/drivers/filesystems/fs_rec/fs_rec.c +++ b/drivers/filesystems/fs_rec/fs_rec.c @@ -238,7 +238,7 @@ FsRecRegisterFs(IN PDRIVER_OBJECT DriverObject, RtlInitUnicodeString(&DeviceName, FsName); InitializeObjectAttributes(&ObjectAttributes, &DeviceName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); diff --git a/drivers/filesystems/udfs/Include/regtools.cpp b/drivers/filesystems/udfs/Include/regtools.cpp index 41113a117e2..3c5e78aba15 100644 --- a/drivers/filesystems/udfs/Include/regtools.cpp +++ b/drivers/filesystems/udfs/Include/regtools.cpp @@ -26,7 +26,7 @@ RegTGetKeyHandle( InitializeObjectAttributes( &ObjectAttributes, &NameString, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, hRootKey, NULL ); @@ -276,4 +276,3 @@ RegTGetStringValue( } return retval; } // end RegTGetStringValue() - diff --git a/drivers/filesystems/udfs/udfinit.cpp b/drivers/filesystems/udfs/udfinit.cpp index 4eaa1c96455..9030ecf79c0 100644 --- a/drivers/filesystems/udfs/udfinit.cpp +++ b/drivers/filesystems/udfs/udfinit.cpp @@ -649,7 +649,7 @@ UDFDismountDevice( InitializeObjectAttributes ( &ObjectAttributes, unicodeCdRomDeviceName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL ); diff --git a/drivers/ksfilter/ks/connectivity.c b/drivers/ksfilter/ks/connectivity.c index b5d348106b6..ba7db56d8b5 100644 --- a/drivers/ksfilter/ks/connectivity.c +++ b/drivers/ksfilter/ks/connectivity.c @@ -265,7 +265,7 @@ KspReadMediaCategory( RtlFreeUnicodeString(&GuidString); /* initialize object attributes */ - InitializeObjectAttributes(&ObjectAttributes, &Path, OBJ_CASE_INSENSITIVE, NULL, NULL); + InitializeObjectAttributes(&ObjectAttributes, &Path, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); /* open the key */ Status = ZwOpenKey(&hKey, GENERIC_READ, &ObjectAttributes); @@ -839,4 +839,3 @@ KsHandleSizedListQuery( return STATUS_BUFFER_TOO_SMALL; } } - diff --git a/drivers/ksfilter/ks/image.c b/drivers/ksfilter/ks/image.c index 6634b9989fc..c35728fea92 100644 --- a/drivers/ksfilter/ks/image.c +++ b/drivers/ksfilter/ks/image.c @@ -239,7 +239,7 @@ KsMapModuleName( RtlAppendUnicodeStringToString(&SubKeyName, ModuleName); /* initialize subkey attributes */ - InitializeObjectAttributes(&ObjectAttributes, &SubKeyName, OBJ_CASE_INSENSITIVE, hKey, NULL); + InitializeObjectAttributes(&ObjectAttributes, &SubKeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, hKey, NULL); /* now open the subkey */ Status = ZwOpenKey(&hSubKey, GENERIC_READ, &ObjectAttributes); @@ -263,6 +263,3 @@ KsMapModuleName( /* return status */ return Status; } - - - diff --git a/drivers/serial/serial/pnp.c b/drivers/serial/serial/pnp.c index 94dcc1b8931..a55e5376b59 100644 --- a/drivers/serial/serial/pnp.c +++ b/drivers/serial/serial/pnp.c @@ -296,7 +296,7 @@ SerialPnpStartDevice( /* Write an entry value under HKLM\HARDWARE\DeviceMap\SERIALCOMM */ /* This step is not mandatory, so don't exit in case of error */ RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\HARDWARE\\DeviceMap\\SERIALCOMM"); - InitializeObjectAttributes(&objectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, NULL, NULL); + InitializeObjectAttributes(&objectAttributes, &KeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); Status = ZwCreateKey(&hKey, KEY_SET_VALUE, &objectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); if (NT_SUCCESS(Status)) { diff --git a/drivers/wdm/audio/legacy/wdmaud/mmixer.c b/drivers/wdm/audio/legacy/wdmaud/mmixer.c index 12536830be1..dbf97ba5608 100644 --- a/drivers/wdm/audio/legacy/wdmaud/mmixer.c +++ b/drivers/wdm/audio/legacy/wdmaud/mmixer.c @@ -129,7 +129,7 @@ OpenKey( RtlInitUnicodeString(&SubKeyName, lpSubKeyName); /* initialize key attributes */ - InitializeObjectAttributes(&ObjectAttributes, &SubKeyName, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, hKey, NULL); + InitializeObjectAttributes(&ObjectAttributes, &SubKeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE | OBJ_OPENIF, hKey, NULL); /* open the key */ Status = ZwOpenKey(OutKey, DesiredAccess, &ObjectAttributes); diff --git a/drivers/wdm/audio/legacy/wdmaud/sup.c b/drivers/wdm/audio/legacy/wdmaud/sup.c index d3b53086a49..91334c09bb3 100644 --- a/drivers/wdm/audio/legacy/wdmaud/sup.c +++ b/drivers/wdm/audio/legacy/wdmaud/sup.c @@ -274,7 +274,7 @@ FindProductName( /* initialize key attributes */ - InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, NULL, NULL); + InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE | OBJ_OPENIF, NULL, NULL); /* open the key */ Status = ZwOpenKey(&hKey, GENERIC_READ, &ObjectAttributes); @@ -324,7 +324,7 @@ FindProductName( RtlInitUnicodeString(&SubKeyName, SubKey); /* initialize key attributes */ - InitializeObjectAttributes(&ObjectAttributes, &SubKeyName, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, hKey, NULL); + InitializeObjectAttributes(&ObjectAttributes, &SubKeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE | OBJ_OPENIF, hKey, NULL); /* open the sub key */ Status = ZwOpenKey(&hSubKey, GENERIC_READ, &ObjectAttributes);

2 years, 7 months

[reactos] 04/04: [NTOS] Don't define _IN_KERNEL_ globally for the kernel, but just where it's needed: when including regstr.h.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b414e1e4d7c89803fd371… commit b414e1e4d7c89803fd3712c721039266338a35dc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 8 05:35:43 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat May 7 18:38:35 2022 +0200 [NTOS] Don't define _IN_KERNEL_ globally for the kernel, but just where it's needed: when including regstr.h. --- ntoskrnl/include/ntoskrnl.h | 4 ++++ ntoskrnl/ntos.cmake | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/include/ntoskrnl.h b/ntoskrnl/include/ntoskrnl.h index 643562e60f0..6f2f5379bec 100644 --- a/ntoskrnl/include/ntoskrnl.h +++ b/ntoskrnl/include/ntoskrnl.h @@ -58,9 +58,13 @@ #include <ndk/rtlfuncs.h> #include <ndk/sefuncs.h> #include <ndk/vftypes.h> + #undef TEXT #define TEXT(s) L##s + +#define _IN_KERNEL_ #include <regstr.h> + #include <ntstrsafe.h> #include <ntpoapi.h> #define ENABLE_INTSAFE_SIGNED_FUNCTIONS diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index eb6cfa817c3..2284563e436 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -11,7 +11,6 @@ include_directories( add_definitions( -D_NTOSKRNL_ -D_NTSYSTEM_ - -D_IN_KERNEL_ -DNTDDI_VERSION=0x05020400) if(NOT DEFINED NEWCC)

2 years, 7 months

[reactos] 03/04: [HALARM] Update defines in hal.h

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=551d28e09f65b61a1006d… commit 551d28e09f65b61a1006de75f62acdc653a4e906 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 8 04:56:32 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat May 7 18:23:29 2022 +0200 [HALARM] Update defines in hal.h --- hal/halarm/include/hal.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/hal/halarm/include/hal.h b/hal/halarm/include/hal.h index e6ae706ce01..4be7bd03682 100644 --- a/hal/halarm/include/hal.h +++ b/hal/halarm/include/hal.h @@ -15,9 +15,6 @@ /* WDK HAL Compilation hack */ #include <excpt.h> #include <ntdef.h> -#undef _NTHAL_ -#undef DECLSPEC_IMPORT -#define DECLSPEC_IMPORT #undef NTSYSAPI #define NTSYSAPI __declspec(dllimport)

2 years, 7 months

[reactos] 02/04: [NDK][HAL][NTOS] Add missing PRCB_MINOR_VERSION / PRCB_MAJOR_VERSION and use them.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ea2b803c885fc3bd705d… commit 9ea2b803c885fc3bd705d18709565775fff44dfa Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 8 02:25:53 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat May 7 18:14:38 2022 +0200 [NDK][HAL][NTOS] Add missing PRCB_MINOR_VERSION / PRCB_MAJOR_VERSION and use them. --- hal/halarm/generic/halinit.c | 4 ++-- ntoskrnl/ke/amd64/kiinit.c | 4 ++-- ntoskrnl/ke/arm/kiinit.c | 4 ++-- ntoskrnl/ke/i386/kiinit.c | 4 ++-- sdk/include/ndk/amd64/ketypes.h | 1 + sdk/include/ndk/arm/ketypes.h | 1 + sdk/include/ndk/i386/ketypes.h | 1 + sdk/include/ndk/powerpc/ketypes.h | 12 ++++++++++-- 8 files changed, 21 insertions(+), 10 deletions(-) diff --git a/hal/halarm/generic/halinit.c b/hal/halarm/generic/halinit.c index 532110bd809..24836de2a23 100644 --- a/hal/halarm/generic/halinit.c +++ b/hal/halarm/generic/halinit.c @@ -56,7 +56,7 @@ HalInitSystem(IN ULONG BootPhase, if (!(Prcb->BuildType & PRCB_BUILD_DEBUG)) { /* No match, bugcheck */ - KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, 1, 0); + KeBugCheckEx(MISMATCHED_HAL, 2, Prcb->BuildType, PRCB_BUILD_DEBUG, 0); } #else /* Release build requires release HAL */ @@ -80,7 +80,7 @@ HalInitSystem(IN ULONG BootPhase, if (Prcb->MajorVersion != PRCB_MAJOR_VERSION) { /* Validation failed, bugcheck */ - KeBugCheckEx(MISMATCHED_HAL, 1, Prcb->MajorVersion, 1, 0); + KeBugCheckEx(MISMATCHED_HAL, 1, Prcb->MajorVersion, PRCB_MAJOR_VERSION, 0); } /* Initialize interrupts */ diff --git a/ntoskrnl/ke/amd64/kiinit.c b/ntoskrnl/ke/amd64/kiinit.c index 9e1c23138f9..d9c8807bf34 100644 --- a/ntoskrnl/ke/amd64/kiinit.c +++ b/ntoskrnl/ke/amd64/kiinit.c @@ -108,8 +108,8 @@ KiInitializePcr(IN PKIPCR Pcr, Pcr->MinorVersion = PCR_MINOR_VERSION; /* Set the PRCB Version */ - Pcr->Prcb.MajorVersion = 1; - Pcr->Prcb.MinorVersion = 1; + Pcr->Prcb.MajorVersion = PRCB_MAJOR_VERSION; + Pcr->Prcb.MinorVersion = PRCB_MINOR_VERSION; /* Set the Build Type */ Pcr->Prcb.BuildType = 0; diff --git a/ntoskrnl/ke/arm/kiinit.c b/ntoskrnl/ke/arm/kiinit.c index c6f4edd594c..86db2d9377f 100644 --- a/ntoskrnl/ke/arm/kiinit.c +++ b/ntoskrnl/ke/arm/kiinit.c @@ -195,8 +195,8 @@ KiInitializePcr(IN ULONG ProcessorNumber, Pcr->MinorVersion = PCR_MINOR_VERSION; /* Set the PCRB Version */ - Pcr->Prcb.MajorVersion = 1; - Pcr->Prcb.MinorVersion = 1; + Pcr->Prcb.MajorVersion = PRCB_MAJOR_VERSION; + Pcr->Prcb.MinorVersion = PRCB_MINOR_VERSION; /* Set the Build Type */ Pcr->Prcb.BuildType = 0; diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c index 7f0651e260a..b0af4c05d53 100644 --- a/ntoskrnl/ke/i386/kiinit.c +++ b/ntoskrnl/ke/i386/kiinit.c @@ -307,8 +307,8 @@ KiInitializePcr(IN ULONG ProcessorNumber, Pcr->MinorVersion = PCR_MINOR_VERSION; /* Set the PCRB Version */ - Pcr->PrcbData.MajorVersion = 1; - Pcr->PrcbData.MinorVersion = 1; + Pcr->PrcbData.MajorVersion = PRCB_MAJOR_VERSION; + Pcr->PrcbData.MinorVersion = PRCB_MINOR_VERSION; /* Set the Build Type */ Pcr->PrcbData.BuildType = 0; diff --git a/sdk/include/ndk/amd64/ketypes.h b/sdk/include/ndk/amd64/ketypes.h index cd2083e20e3..9bdb9e43bc2 100644 --- a/sdk/include/ndk/amd64/ketypes.h +++ b/sdk/include/ndk/amd64/ketypes.h @@ -242,6 +242,7 @@ typedef enum // // PRCB Flags // +#define PRCB_MINOR_VERSION 1 #define PRCB_MAJOR_VERSION 1 #define PRCB_BUILD_DEBUG 1 #define PRCB_BUILD_UNIPROCESSOR 2 diff --git a/sdk/include/ndk/arm/ketypes.h b/sdk/include/ndk/arm/ketypes.h index 26c40706a31..c047436d769 100644 --- a/sdk/include/ndk/arm/ketypes.h +++ b/sdk/include/ndk/arm/ketypes.h @@ -281,6 +281,7 @@ typedef enum // // PRCB Flags // +#define PRCB_MINOR_VERSION 1 #define PRCB_MAJOR_VERSION 1 #define PRCB_BUILD_DEBUG 1 #define PRCB_BUILD_UNIPROCESSOR 2 diff --git a/sdk/include/ndk/i386/ketypes.h b/sdk/include/ndk/i386/ketypes.h index cd1bdb1c5ba..8a9ea4c2ad5 100644 --- a/sdk/include/ndk/i386/ketypes.h +++ b/sdk/include/ndk/i386/ketypes.h @@ -160,6 +160,7 @@ typedef enum // // PRCB Flags // +#define PRCB_MINOR_VERSION 1 #define PRCB_MAJOR_VERSION 1 #define PRCB_BUILD_DEBUG 1 #define PRCB_BUILD_UNIPROCESSOR 2 diff --git a/sdk/include/ndk/powerpc/ketypes.h b/sdk/include/ndk/powerpc/ketypes.h index f8f29a407f5..16554a6c5e7 100644 --- a/sdk/include/ndk/powerpc/ketypes.h +++ b/sdk/include/ndk/powerpc/ketypes.h @@ -33,10 +33,18 @@ Author: #define IPI_SYNCH_REQUEST 10 #define MAXIMUM_VECTOR 0x100 +// +// Static Kernel-Mode Address start (use MM_KSEG0_BASE for actual) +// #define KSEG0_BASE 0x80000000 -#define PRCB_MAJOR_VERSION 1 -#define PRCB_BUILD_DEBUG 1 +// +// PRCB Flags +// +#define PRCB_MINOR_VERSION 1 +#define PRCB_MAJOR_VERSION 1 +#define PRCB_BUILD_DEBUG 1 +#define PRCB_BUILD_UNIPROCESSOR 2 #ifndef ROUND_UP #define ROUND_UP(x,y) (((x) + ((y)-1)) & ~((y)-1))

2 years, 7 months

[reactos] 01/04: [NTOS] Remove ROS-specific __NTOSKRNL__

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cfbb73479921df36e6dcf… commit cfbb73479921df36e6dcf1f04f1da98d35c1261f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 8 00:42:06 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat May 7 17:53:51 2022 +0200 [NTOS] Remove ROS-specific __NTOSKRNL__ See https://reactos.org/archives/public/ros-kernel/2004-June/003878.html > In the source files one set of headers is included if __NTDLL__ is defines and onother set if __NTOSKRNL__ is defines (dirty workaround for our messy headers). --- ntoskrnl/include/internal/kd.h | 3 ++- ntoskrnl/ntos.cmake | 1 - sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt | 2 +- sdk/lib/drivers/rtlver/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index 6a509de9db0..b7cad5dc8bb 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -28,7 +28,8 @@ KdPortPutByteEx( ); /* SYMBOL ROUTINES **********************************************************/ -#ifdef __NTOSKRNL__ + +#ifdef _NTOSKRNL_ #ifdef KDBG # define KdbInit() KdbpCliInit() diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index 31d65884253..eb6cfa817c3 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -9,7 +9,6 @@ include_directories( ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers) add_definitions( - -D__NTOSKRNL__ -D_NTOSKRNL_ -D_NTSYSTEM_ -D_IN_KERNEL_ diff --git a/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt b/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt index 934b4bc2054..ae8970d20cd 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt +++ b/sdk/lib/drivers/ntoskrnl_vista/CMakeLists.txt @@ -1,7 +1,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-DUNICODE -D_UNICODE -D__NTOSKRNL__ -D_NTOSKRNL_ -D_NTSYSTEM_) +add_definitions(-DUNICODE -D_UNICODE -D_NTOSKRNL_ -D_NTSYSTEM_) include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/rtl) diff --git a/sdk/lib/drivers/rtlver/CMakeLists.txt b/sdk/lib/drivers/rtlver/CMakeLists.txt index d568968da19..357b2a7ab4b 100644 --- a/sdk/lib/drivers/rtlver/CMakeLists.txt +++ b/sdk/lib/drivers/rtlver/CMakeLists.txt @@ -1,4 +1,4 @@ -add_definitions(-DUNICODE -D_UNICODE -D__NTOSKRNL__ -D_NTOSKRNL_ -D_NTSYSTEM_) +add_definitions(-DUNICODE -D_UNICODE -D_NTOSKRNL_ -D_NTSYSTEM_) list(APPEND SOURCE rtl.c)

2 years, 7 months

[reactos] 02/02: [NVNET] Add more controller descriptions

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11d3e3252dc01eb529515… commit 11d3e3252dc01eb529515be79150919d8b47a0ca Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat May 7 17:24:06 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat May 7 18:00:15 2022 +0300 [NVNET] Add more controller descriptions Addendum to b79fbe23. Based on NvNetRecognizeHardware function in nic.c --- drivers/network/dd/nvnet/netnv.inf | 110 +++++++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 42 deletions(-) diff --git a/drivers/network/dd/nvnet/netnv.inf b/drivers/network/dd/nvnet/netnv.inf index 9e1aafd4fee..31a05e9680b 100644 --- a/drivers/network/dd/nvnet/netnv.inf +++ b/drivers/network/dd/nvnet/netnv.inf @@ -21,46 +21,46 @@ DefaultDestDir = 12 ExcludeFromSelect = * [nVidiaMfg] -%NVNET.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_01C3 -%NVNET.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_0066 -%NVNET.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_00D6 -%NVNET.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0086 -%NVNET.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_008C -%NVNET.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_00E6 -%NVNET.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_00DF -%NVNET.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0056 -%NVNET.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0057 -%NVNET.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0037 -%NVNET.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0038 -%NVNET.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_0268 -%NVNET.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_0269 -%NVNET.DeviceDesc% = NVNET_Inst_V3.ndi,PCI\VEN_10DE&DEV_0372 -%NVNET.DeviceDesc% = NVNET_Inst_V3.ndi,PCI\VEN_10DE&DEV_0373 -%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_03E5 -%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_03E6 -%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_03EE -%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_03EF -%NVNET.DeviceDesc% = NVNET_Inst_V5.ndi,PCI\VEN_10DE&DEV_0450 -%NVNET.DeviceDesc% = NVNET_Inst_V5.ndi,PCI\VEN_10DE&DEV_0451 -%NVNET.DeviceDesc% = NVNET_Inst_V5.ndi,PCI\VEN_10DE&DEV_0452 -%NVNET.DeviceDesc% = NVNET_Inst_V5.ndi,PCI\VEN_10DE&DEV_0453 -%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_054C -%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_054D -%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_054E -%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_054F -%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_07DC -%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_07DD -%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_07DE -%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_07DF -%NVNET.DeviceDesc% = NVNET_Inst_V6.ndi,PCI\VEN_10DE&DEV_0760 -%NVNET.DeviceDesc% = NVNET_Inst_V6.ndi,PCI\VEN_10DE&DEV_0761 -%NVNET.DeviceDesc% = NVNET_Inst_V6.ndi,PCI\VEN_10DE&DEV_0762 -%NVNET.DeviceDesc% = NVNET_Inst_V6.ndi,PCI\VEN_10DE&DEV_0763 -%NVNET.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0AB0 -%NVNET.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0AB1 -%NVNET.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0AB2 -%NVNET.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0AB3 -%NVNET.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0D7D +%nForce.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_01C3 +%nForce2.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_0066 +%nForce2.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_00D6 +%nForce3.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0086 +%nForce3.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_008C +%nForce3.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_00E6 +%nForce3.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_00DF +%CK804.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0056 +%CK804.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0057 +%MCP04.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0037 +%MCP04.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0038 +%MCP51.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_0268 +%MCP51.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_0269 +%MCP55.DeviceDesc% = NVNET_Inst_V3.ndi,PCI\VEN_10DE&DEV_0372 +%MCP55.DeviceDesc% = NVNET_Inst_V3.ndi,PCI\VEN_10DE&DEV_0373 +%MCP61.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_03E5 +%MCP61.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_03E6 +%MCP61.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_03EE +%MCP61.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_03EF +%MCP65.DeviceDesc% = NVNET_Inst_V5.ndi,PCI\VEN_10DE&DEV_0450 +%MCP65.DeviceDesc% = NVNET_Inst_V5.ndi,PCI\VEN_10DE&DEV_0451 +%MCP65.DeviceDesc% = NVNET_Inst_V5.ndi,PCI\VEN_10DE&DEV_0452 +%MCP65.DeviceDesc% = NVNET_Inst_V5.ndi,PCI\VEN_10DE&DEV_0453 +%MCP67.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_054C +%MCP67.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_054D +%MCP67.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_054E +%MCP67.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_054F +%MCP73.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_07DC +%MCP73.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_07DD +%MCP73.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_07DE +%MCP73.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_07DF +%MCP77.DeviceDesc% = NVNET_Inst_V6.ndi,PCI\VEN_10DE&DEV_0760 +%MCP77.DeviceDesc% = NVNET_Inst_V6.ndi,PCI\VEN_10DE&DEV_0761 +%MCP77.DeviceDesc% = NVNET_Inst_V6.ndi,PCI\VEN_10DE&DEV_0762 +%MCP77.DeviceDesc% = NVNET_Inst_V6.ndi,PCI\VEN_10DE&DEV_0763 +%MCP79.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0AB0 +%MCP79.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0AB1 +%MCP79.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0AB2 +%MCP79.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0AB3 +%MCP89.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0D7D ;----------------------------- NVNET DRIVER ----------------------------- @@ -261,7 +261,20 @@ VT = "VLAN Tagging" VI = "VLAN ID" JF = "Jumbo Frame" -NVNET.DeviceDesc = "nVidia nForce PCI Ethernet Controller" +nForce.DeviceDesc = "nVidia nForce PCI Ethernet Controller" +nForce2.DeviceDesc = "nVidia nForce2 PCI Ethernet Controller" +nForce3.DeviceDesc = "nVidia nForce3 PCI Ethernet Controller" +CK804.DeviceDesc = "nVidia CK804 PCI Ethernet Controller" +MCP04.DeviceDesc = "nVidia MCP04 PCI Ethernet Controller" +MCP51.DeviceDesc = "nVidia MCP51 PCI Ethernet Controller" +MCP55.DeviceDesc = "nVidia MCP55 PCI Ethernet Controller" +MCP61.DeviceDesc = "nVidia MCP61 PCI Ethernet Controller" +MCP65.DeviceDesc = "nVidia MCP65 PCI Ethernet Controller" +MCP67.DeviceDesc = "nVidia MCP67 PCI Ethernet Controller" +MCP73.DeviceDesc = "nVidia MCP73 PCI Ethernet Controller" +MCP77.DeviceDesc = "nVidia MCP77 PCI Ethernet Controller" +MCP79.DeviceDesc = "nVidia MCP79 PCI Ethernet Controller" +MCP89.DeviceDesc = "nVidia MCP89 PCI Ethernet Controller" [Strings.0419] ReactOS = "Команда ReactOS" @@ -285,4 +298,17 @@ PP = "Приоритет кадров" VT = "Маркировка кадров" JF = "Кадры большого размера" -NVNET.DeviceDesc = "nVidia nForce PCI сетевой контроллер" +nForce.DeviceDesc = "nVidia nForce PCI сетевой контроллер" +nForce2.DeviceDesc = "nVidia nForce2 PCI сетевой контроллер" +nForce3.DeviceDesc = "nVidia nForce3 PCI сетевой контроллер" +CK804.DeviceDesc = "nVidia CK804 PCI сетевой контроллер" +MCP04.DeviceDesc = "nVidia MCP04 PCI сетевой контроллер" +MCP51.DeviceDesc = "nVidia MCP51 PCI сетевой контроллер" +MCP55.DeviceDesc = "nVidia MCP55 PCI сетевой контроллер" +MCP61.DeviceDesc = "nVidia MCP61 PCI сетевой контроллер" +MCP65.DeviceDesc = "nVidia MCP65 PCI сетевой контроллер" +MCP67.DeviceDesc = "nVidia MCP67 PCI сетевой контроллер" +MCP73.DeviceDesc = "nVidia MCP73 PCI сетевой контроллер" +MCP77.DeviceDesc = "nVidia MCP77 PCI сетевой контроллер" +MCP79.DeviceDesc = "nVidia MCP79 PCI сетевой контроллер" +MCP89.DeviceDesc = "nVidia MCP89 PCI сетевой контроллер"

2 years, 7 months

[reactos] 01/02: [AC97] Fix driver provider name

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5e77976049a25bc386e7… commit b5e77976049a25bc386e7c151ac4dad0c9dc0244 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat May 7 16:44:23 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat May 7 18:00:13 2022 +0300 [AC97] Fix driver provider name - Also sort out non-localizeable lines - Fix German translation encoding and add missing one - Add Russian translation Addendum to 9c79a798, 68e19a95 and 9ca32a2b. --- drivers/wdm/audio/drivers/ac97/ac97.inf | 119 +++++++++++++++++--------------- 1 file changed, 64 insertions(+), 55 deletions(-) diff --git a/drivers/wdm/audio/drivers/ac97/ac97.inf b/drivers/wdm/audio/drivers/ac97/ac97.inf index 8a08c65b9f3..7c3a8350720 100644 --- a/drivers/wdm/audio/drivers/ac97/ac97.inf +++ b/drivers/wdm/audio/drivers/ac97/ac97.inf @@ -18,7 +18,7 @@ Signature="$CHICAGO$" Class=MEDIA ClassGUID={4d36e96c-e325-11ce-bfc1-08002be10318} -provider=%ProviderName% +Provider=%ReactOS% ;;The following line is used only when the INF comes with the Windows system ;;IHV needs to comment out the following line for their OEM redistributed disk. ;;LayoutFile=layout.inf, layout1.inf, layout2.inf @@ -334,7 +334,7 @@ AddService = ac97, 0x00000002, ac97_Service_Inst [Strings] -ProviderName="FooProviderName" +ReactOS="ReactOS Team" MfgName="Intel" DiskDescription="AC'97 WDM Driver Disk" @@ -354,6 +354,9 @@ ac97.DeviceDesc="Intel 82801 AC'97 Audio Controller" ac97.Wave.szPname="AC'97 Sound Card" ac97.Topology.szPname="AC'97 Mixer" +ac97.SvcDesc = "Service for AC'97 Driver (WDM)" + +;; Registry (non-localizeable) MediaCategories="SYSTEM\CurrentControlSet\Control\MediaCategories" Proxy.CLSID="{17CCA71B-ECD7-11D0-B908-00A0C9223196}" @@ -364,8 +367,6 @@ KSCATEGORY_REALTIME="{EB115FFC-10C8-4964-831D-6DCB02E6F23F}" KSNAME_Wave="Wave" KSNAME_Topology="Topology" -ac97.SvcDesc = "Service for AC'97 Driver (WDM)" - ;; Nodes (non-localizeable) ICHGUID.PhoneVolume ="{0A8C1A87-42B0-11D2-95D2-00C04FB925D3}" ICHGUID.PhoneMute ="{0A8C1A88-42B0-11D2-95D2-00C04FB925D3}" @@ -398,7 +399,6 @@ ICHGUID.Center ="{2D97372F-9CF6-4fd6-9E56-C68BACDF360D}" ICHGUID.LFE ="{B60C4274-3BFD-430b-8364-D947E7D304B1}" ICHGUID.Front ="{070395E2-BE7C-4b4d-B529-40CB9BFCF995}" - ;; Nodes (localizeable) ICHNode.PhoneVolume ="Phone Volume" ICHNode.PhoneMute ="Phone Mute" @@ -432,10 +432,8 @@ ICHPin.LFE ="Subwoofer" ICHPin.Front ="Front Speaker" [Strings.0407] -ProviderName="FooProviderName" -MfgName="Intel" +DiskDescription="Diskette für AC'97 WDM Treiber" -DiskDescription="Diskette für AC'97 WDM Treiberbeispiel" ac97_440MX.DeviceDesc="Intel 82440MX AC'97 Audiocontroller" ac97_AA.DeviceDesc="Intel 82801AA AC'97 Audiocontroller" ac97_AB.DeviceDesc="Intel 82801AB AC'97 Audiocontroller" @@ -452,53 +450,9 @@ ac97.DeviceDesc="Intel 82801 AC'97 Audiocontroller" ac97.Wave.szPname="AC'97 Musikkarte" ac97.Topology.szPname="AC'97 Mixer" -MediaCategories="SYSTEM\CurrentControlSet\Control\MediaCategories" - -Proxy.CLSID="{17CCA71B-ECD7-11D0-B908-00A0C9223196}" -KSCATEGORY_AUDIO="{6994AD04-93EF-11D0-A3CC-00A0C9223196}" -KSCATEGORY_RENDER="{65E8773E-8F56-11D0-A3B9-00A0C9223196}" -KSCATEGORY_CAPTURE="{65E8773D-8F56-11D0-A3B9-00A0C9223196}" -KSCATEGORY_REALTIME="{EB115FFC-10C8-4964-831D-6DCB02E6F23F}" -KSNAME_Wave="Wave" -KSNAME_Topology="Topology" - -ac97.SvcDesc = "Installationshilfe für AC'97 Treiberbeispiel (WDM)" - - -;; Nodes (non-localizeable) -ICHGUID.PhoneVolume ="{0A8C1A87-42B0-11D2-95D2-00C04FB925D3}" -ICHGUID.PhoneMute ="{0A8C1A88-42B0-11D2-95D2-00C04FB925D3}" -ICHGUID.LineInMute ="{0A8C1A91-42B0-11D2-95D2-00C04FB925D3}" -ICHGUID.MainMix ="{0A8C1A9B-42B0-11D2-95D2-00C04FB925D3}" -ICHGUID.3DBypass ="{0A8C1A9E-42B0-11D2-95D2-00C04FB925D3}" -ICHGUID.3DEnable ="{766DB5A4-6E94-11D2-9ADE-00C04F8EFB68}" -ICHGUID.BeepMix ="{0A8C1A9F-42B0-11D2-95D2-00C04FB925D3}" -ICHGUID.HPVolume ="{0A8C1AA5-42B0-11D2-95D2-00C04FB925D3}" -ICHGUID.HPMute ="{0A8C1AA6-42B0-11D2-95D2-00C04FB925D3}" -ICHGUID.MonoOutSelect ="{0A8C1AA9-42B0-11D2-95D2-00C04FB925D3}" -ICHGUID.WaveInSelect ="{0A8C1AAE-42B0-11D2-95D2-00C04FB925D3}" -ICHGUID.MasterInVolume ="{0A8C1AAF-42B0-11D2-95D2-00C04FB925D3}" -ICHGUID.MasterInMute ="{0A8C1AB0-42B0-11D2-95D2-00C04FB925D3}" -ICHGUID.MicInVolume ="{0A8C1AB2-42B0-11D2-95D2-00C04FB925D3}" -ICHGUID.MicInMute ="{0A8C1AB3-42B0-11D2-95D2-00C04FB925D3}" -ICHGUID.SimulStereo ="{B3AD50B5-3849-4983-ADD7-25E6268F912D}" -ICHGUID.SurroundVolume ="{A4B68BA4-6958-4ab4-BB01-E23C6F027C88}" -ICHGUID.SurroundMute ="{22654FBC-AC8F-4224-B19F-D858D2E10BDD}" -ICHGUID.CenterVolume ="{9B0F1946-ABD2-47a8-A778-BB86CDE1A167}" -ICHGUID.CenterMute ="{BEEF51ED-1041-43f8-9B96-5863D0A9342D}" -ICHGUID.LFEVolume ="{455FA6F2-21EC-4df4-B1E4-3155209797F3}" -ICHGUID.LFEMute ="{4A4D9210-C780-4768-BFD2-525FDBF4FCB4}" -ICHGUID.FrontVolume ="{9F4801BD-F746-4c7a-8A9D-F6E99004CC98}" -ICHGUID.FrontMute ="{C8E03B2A-EBD9-4554-A750-8E4472750A5B}" - -;; Pins (non-localizeable) -ICHGUID.Surround ="{81FBB14B-1BEE-4bf5-92EE-FFC4F75F326D}" -ICHGUID.Center ="{2D97372F-9CF6-4fd6-9E56-C68BACDF360D}" -ICHGUID.LFE ="{B60C4274-3BFD-430b-8364-D947E7D304B1}" -ICHGUID.Front ="{070395E2-BE7C-4b4d-B529-40CB9BFCF995}" +ac97.SvcDesc = "Dienst für AC'97 Treiber (WDM)" ;; Nodes (localizeable) - ICHNode.PhoneVolume ="Phone Lautstärke" ICHNode.PhoneMute ="Phone Aus" ICHNode.LineInMute ="Line In Aus" @@ -506,6 +460,8 @@ ICHNode.MainMix ="Hauptmixer" ICHNode.3DBypass ="3D umgehen" ICHNode.3DEnable ="3D Aktivieren" ICHNode.BeepMix ="Piepmixer" +ICHNode.HPVolume ="Kopfhörer Lautstärke" +ICHNode.HPMute ="Kopfhörer Aus" ICHNode.MonoOutSelect ="Mono Ausgang Selektor" ICHNode.WaveInSelect ="Aufnahme Selektor" ICHNode.MasterInVolume ="Aufnahme Lautstärke" @@ -520,11 +476,64 @@ ICHNode.CenterMute ="Lautsprecher Mitte Aus" ICHNode.LFEVolume ="Bass Lautsprecherlautstärke" ICHNode.LFEMute ="Bass Lautsprecher Aus" ICHNode.FrontVolume ="Lautsprecherlautstärke Vorne" -ICHNode.HPVolume ="Kopfh�rer Lautst�rke" -ICHNode.HPMute ="Kopfh�rer Aus" +ICHNode.FrontMute ="Lautsprecherlautstärke Aus" ;; Pins ICHPin.Surround ="Lautsprecher Hinten" ICHPin.Center ="Lautsprecher Mitte" ICHPin.LFE ="Bass Lautsprecher" ICHPin.Front ="Lautsprecher Vorne" + +[Strings.0419] +ReactOS="Команда ReactOS" +DiskDescription="Диск с драйвером AC'97 WDM" + +ac97_440MX.DeviceDesc="Intel 82440MX AC'97 аудиоконтроллер" +ac97_AA.DeviceDesc="Intel 82801AA AC'97 аудиоконтроллер" +ac97_AB.DeviceDesc="Intel 82801AB AC'97 аудиоконтроллер" +ac97_BA.DeviceDesc="Intel 82801BA/BAM AC'97 аудиоконтроллер" +ac97_CA.DeviceDesc="Intel 82801CA/CAM AC'97 аудиоконтроллер" +ac97_DB.DeviceDesc="Intel 82801DB/DBL/DBM AC'97 аудиоконтроллер" +ac97_EB.DeviceDesc="Intel 82801EB/ER AC'97 аудиоконтроллер" +ac97_FB.DeviceDesc="Intel 82801FB/FBM/FR/FW/FRW AC'97 аудиоконтроллер" +ac97_GB.DeviceDesc="Intel 82801GB/GR/GDH/GBM/GHM AC'97 аудиоконтроллер" +ac97_6300ESB.DeviceDesc="Intel 6300ESB AC'97 аудиоконтроллер" +ac97_63xxESB.DeviceDesc="Intel 631xESB/632xESB AC'97 аудиоконтроллер" +ac97.DeviceDesc="Intel 82801 AC'97 аудиоконтроллер" + +ac97.Wave.szPname="Звуковая карта AC'97" +ac97.Topology.szPname="Микшер AC'97" + +ac97.SvcDesc = "Служба для драйвера AC'97 (WDM)" + +;; Nodes (localizeable) +ICHNode.PhoneVolume ="Телефон" +ICHNode.PhoneMute ="Заглушить телефон" +ICHNode.LineInMute ="Заглушить линейный вход" +ICHNode.MainMix ="Главный микшер" +ICHNode.3DBypass ="Отключить 3D" +ICHNode.3DEnable ="Включить 3D" +ICHNode.BeepMix ="Динамик ПК" +ICHNode.HPVolume ="Наушники" +ICHNode.HPMute ="Заглушить наушники" +ICHNode.MonoOutSelect ="Моно выход" +ICHNode.WaveInSelect ="Звуковой вход" +ICHNode.MasterInVolume ="Мастер вход" +ICHNode.MasterInMute ="Заглушить мастер вход" +ICHNode.MicInVolume ="Микрофон" +ICHNode.MicInMute ="Заглушить микрофон" +ICHNode.SimulStereo ="Симулятор стерео" +ICHNode.SurroundVolume ="Задние динамики" +ICHNode.SurroundMute ="Заглушить задние динамики" +ICHNode.CenterVolume ="Центральный динамик" +ICHNode.CenterMute ="Заглушить центральный динамик" +ICHNode.LFEVolume ="Сабвуфер" +ICHNode.LFEMute ="Заглушить сабвуфер" +ICHNode.FrontVolume ="Передние динамики" +ICHNode.FrontMute ="Заглушить передние динамики" + +;; Pins +ICHPin.Surround ="Задние динамики" +ICHPin.Center ="Центральный динамик" +ICHPin.LFE ="Сабвуфер" +ICHPin.Front ="Передние динамики"

2 years, 7 months

[reactos] 01/01: [NETAPI32] NetSessionEnum: UncClientName and username are optional

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c70d7550597ba6977f854… commit c70d7550597ba6977f8546c17a1ecb6360281e39 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat May 7 16:53:26 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat May 7 16:54:04 2022 +0200 [NETAPI32] NetSessionEnum: UncClientName and username are optional Do not fail if UncClientName and username are null. --- dll/win32/netapi32/srvsvc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dll/win32/netapi32/srvsvc.c b/dll/win32/netapi32/srvsvc.c index 79a58fc83b6..e820c0d94ad 100644 --- a/dll/win32/netapi32/srvsvc.c +++ b/dll/win32/netapi32/srvsvc.c @@ -663,9 +663,6 @@ NetSessionEnum( if (level > 2 && level != 10 && level != 502) return ERROR_INVALID_LEVEL; - if (UncClientName == NULL || username == NULL) - return ERROR_INVALID_PARAMETER; - *bufptr = NULL; *entriesread = 0;

2 years, 7 months

← Newer
1
...
8
9
10
11
12
13
14
...
17
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 May 2022