Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NTOS:MM] Dump pool consumers at most once per second.
by Thomas Faber 03 Feb '19

03 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=066ee4db3bdd2b7f430a3… commit 066ee4db3bdd2b7f430a33a0c988872cec78744d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Jan 28 22:12:35 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 3 12:54:36 2019 +0100 [NTOS:MM] Dump pool consumers at most once per second. This should avoid some log spam during kmtest:ExPools, which intentionally depletes pool. --- ntoskrnl/mm/ARM3/expool.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 4ec3329f06..9625e50f44 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -47,6 +47,7 @@ KSPIN_LOCK ExpLargePoolTableLock; ULONG ExpPoolBigEntriesInUse; ULONG ExpPoolFlags; ULONG ExPoolFailures; +ULONGLONG MiLastPoolDumpTime; /* Pool block/header/list access macros */ #define POOL_ENTRY(x) (PPOOL_HEADER)((ULONG_PTR)(x) - sizeof(POOL_HEADER)) @@ -1937,11 +1938,14 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, // Out of memory, display current consumption // Let's consider that if the caller wanted more // than a hundred pages, that's a bogus caller - // and we are not out of memory + // and we are not out of memory. Dump at most + // once a second to avoid spamming the log. // - if (NumberOfBytes < 100 * PAGE_SIZE) + if (NumberOfBytes < 100 * PAGE_SIZE && + KeQueryInterruptTime() >= MiLastPoolDumpTime + 10000000) { MiDumpPoolConsumers(FALSE, 0, 0, 0); + MiLastPoolDumpTime = KeQueryInterruptTime(); } #endif @@ -2276,11 +2280,14 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, // Out of memory, display current consumption // Let's consider that if the caller wanted more // than a hundred pages, that's a bogus caller - // and we are not out of memory + // and we are not out of memory. Dump at most + // once a second to avoid spamming the log. // - if (NumberOfBytes < 100 * PAGE_SIZE) + if (NumberOfBytes < 100 * PAGE_SIZE && + KeQueryInterruptTime() >= MiLastPoolDumpTime + 10000000) { MiDumpPoolConsumers(FALSE, 0, 0, 0); + MiLastPoolDumpTime = KeQueryInterruptTime(); } #endif

1 0

[reactos] 02/02: [NTDLL_APITEST] Add test for NtDuplicateObject with OBJ_PROTECT_CLOSE.
by Thomas Faber 02 Feb '19

02 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58215e5fb77a1c457ce26… commit 58215e5fb77a1c457ce26274fdf4d720a982b92b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 2 22:48:51 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 2 23:02:53 2019 +0100 [NTDLL_APITEST] Add test for NtDuplicateObject with OBJ_PROTECT_CLOSE. --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../rostests/apitests/ntdll/NtDuplicateObject.c | 30 ++++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 ++ 3 files changed, 33 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 4860cd225a..e3a2725d6b 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -15,6 +15,7 @@ list(APPEND SOURCE NtCreateKey.c NtCreateThread.c NtDeleteKey.c + NtDuplicateObject.c NtFreeVirtualMemory.c NtLoadUnloadKey.c NtMapViewOfSection.c diff --git a/modules/rostests/apitests/ntdll/NtDuplicateObject.c b/modules/rostests/apitests/ntdll/NtDuplicateObject.c new file mode 100644 index 0000000000..7944c3211e --- /dev/null +++ b/modules/rostests/apitests/ntdll/NtDuplicateObject.c @@ -0,0 +1,30 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Test for NtDuplicateObject + * COPYRIGHT: Copyright 2019 Thomas Faber (thomas.faber(a)reactos.org) + */ + +#include "precomp.h" + +#define OBJ_PROTECT_CLOSE 0x01 + +START_TEST(NtDuplicateObject) +{ + NTSTATUS Status; + HANDLE Handle; + + Handle = NULL; + Status = NtDuplicateObject(NtCurrentProcess(), + NtCurrentProcess(), + NtCurrentProcess(), + &Handle, + GENERIC_ALL, + OBJ_PROTECT_CLOSE, + 0); + ok_hex(Status, STATUS_SUCCESS); + ok(Handle != NULL && Handle != NtCurrentProcess(), + "Handle = %p\n", Handle); + Status = NtClose(Handle); + ok_hex(Status, STATUS_HANDLE_NOT_CLOSABLE); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index e627634de8..a828865d8a 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -13,6 +13,7 @@ extern void func_NtCreateFile(void); extern void func_NtCreateKey(void); extern void func_NtCreateThread(void); extern void func_NtDeleteKey(void); +extern void func_NtDuplicateObject(void); extern void func_NtFreeVirtualMemory(void); extern void func_NtLoadUnloadKey(void); extern void func_NtMapViewOfSection(void); @@ -77,6 +78,7 @@ const struct test winetest_testlist[] = { "NtCreateKey", func_NtCreateKey }, { "NtCreateThread", func_NtCreateThread }, { "NtDeleteKey", func_NtDeleteKey }, + { "NtDuplicateObject", func_NtDuplicateObject }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, { "NtLoadUnloadKey", func_NtLoadUnloadKey }, { "NtMapViewOfSection", func_NtMapViewOfSection },

1 0

[reactos] 01/02: [NTOS:OB] Correctly handle OBJ_PROTECT_CLOSE in ObDuplicateObject.
by Thomas Faber 02 Feb '19

02 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5fc9e0cf2d8d33fa65ef… commit f5fc9e0cf2d8d33fa65ef8be74911da2f5d5c875 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jan 19 11:45:33 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 2 23:02:50 2019 +0100 [NTOS:OB] Correctly handle OBJ_PROTECT_CLOSE in ObDuplicateObject. --- ntoskrnl/ob/obhandle.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ntoskrnl/ob/obhandle.c b/ntoskrnl/ob/obhandle.c index 057cdecd7f..38171d2f16 100644 --- a/ntoskrnl/ob/obhandle.c +++ b/ntoskrnl/ob/obhandle.c @@ -2443,6 +2443,12 @@ ObDuplicateObject(IN PEPROCESS SourceProcess, return Status; } + if (NewHandleEntry.ObAttributes & OBJ_PROTECT_CLOSE) + { + NewHandleEntry.ObAttributes &= ~OBJ_PROTECT_CLOSE; + NewHandleEntry.GrantedAccess |= ObpAccessProtectCloseBit; + } + /* Now create the handle */ NewHandle = ExCreateHandle(HandleTable, &NewHandleEntry); if (!NewHandle)

1 0

[reactos] 02/02: [NTDLL_APITEST] Add tests for zero and negative information class values. CORE-15651
by Thomas Faber 02 Feb '19

02 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a71f3a70d84d1079ca49c… commit a71f3a70d84d1079ca49cbc81622f1ddec97065a Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 2 21:37:08 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 2 22:50:19 2019 +0100 [NTDLL_APITEST] Add tests for zero and negative information class values. CORE-15651 --- modules/rostests/apitests/ntdll/CMakeLists.txt | 4 ++++ .../apitests/ntdll/NtQueryInformationFile.c | 23 ++++++++++++++++++++++ .../apitests/ntdll/NtQuerySystemInformation.c | 19 ++++++++++++++++++ .../apitests/ntdll/NtQueryVolumeInformationFile.c | 3 +++ .../rostests/apitests/ntdll/NtSetInformationFile.c | 19 ++++++++++++++++++ .../apitests/ntdll/NtSetVolumeInformationFile.c | 19 ++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 8 ++++++++ 7 files changed, 95 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 768a522f4a..4860cd225a 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -23,13 +23,17 @@ list(APPEND SOURCE NtOpenProcessToken.c NtOpenThreadToken.c NtProtectVirtualMemory.c + NtQueryInformationFile.c NtQueryInformationProcess.c NtQueryKey.c NtQuerySystemEnvironmentValue.c + NtQuerySystemInformation.c NtQueryVolumeInformationFile.c NtReadFile.c NtSaveKey.c + NtSetInformationFile.c NtSetValueKey.c + NtSetVolumeInformationFile.c NtWriteFile.c RtlAllocateHeap.c RtlBitmap.c diff --git a/modules/rostests/apitests/ntdll/NtQueryInformationFile.c b/modules/rostests/apitests/ntdll/NtQueryInformationFile.c new file mode 100644 index 0000000000..74739bb390 --- /dev/null +++ b/modules/rostests/apitests/ntdll/NtQueryInformationFile.c @@ -0,0 +1,23 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Test for NtQueryInformationFile + * COPYRIGHT: Copyright 2019 Thomas Faber (thomas.faber(a)reactos.org) + */ + +#include "precomp.h" + +#define ntv6(x) (LOBYTE(LOWORD(GetVersion())) >= 6 ? (x) : 0) + +START_TEST(NtQueryInformationFile) +{ + NTSTATUS Status; + + Status = NtQueryInformationFile(NULL, NULL, NULL, 0, 0); + ok(Status == STATUS_INVALID_INFO_CLASS || + ntv6(Status == STATUS_NOT_IMPLEMENTED), "Status = %lx\n", Status); + + Status = NtQueryInformationFile(NULL, NULL, NULL, 0, 0x80000000); + ok(Status == STATUS_INVALID_INFO_CLASS || + ntv6(Status == STATUS_NOT_IMPLEMENTED), "Status = %lx\n", Status); +} diff --git a/modules/rostests/apitests/ntdll/NtQuerySystemInformation.c b/modules/rostests/apitests/ntdll/NtQuerySystemInformation.c new file mode 100644 index 0000000000..0ecd91d668 --- /dev/null +++ b/modules/rostests/apitests/ntdll/NtQuerySystemInformation.c @@ -0,0 +1,19 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Test for NtQuerySystemInformation + * COPYRIGHT: Copyright 2019 Thomas Faber (thomas.faber(a)reactos.org) + */ + +#include "precomp.h" + +START_TEST(NtQuerySystemInformation) +{ + NTSTATUS Status; + + Status = NtQuerySystemInformation(0, NULL, 0, NULL); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + Status = NtQuerySystemInformation(0x80000000, NULL, 0, NULL); + ok_hex(Status, STATUS_INVALID_INFO_CLASS); +} diff --git a/modules/rostests/apitests/ntdll/NtQueryVolumeInformationFile.c b/modules/rostests/apitests/ntdll/NtQueryVolumeInformationFile.c index b361d26681..c6fb6eb260 100644 --- a/modules/rostests/apitests/ntdll/NtQueryVolumeInformationFile.c +++ b/modules/rostests/apitests/ntdll/NtQueryVolumeInformationFile.c @@ -278,6 +278,9 @@ START_TEST(NtQueryVolumeInformationFile) ok(status == STATUS_INVALID_INFO_CLASS, "Expected STATUS_INVALID_INFO_CLASS, got 0x%lx\n", status); ok(GetLastError() == 0xcacacaca, "Expected 0xcacacaca, got %lx\n", GetLastError()); + status = NtQueryVolumeInformationFile(NULL, NULL, NULL, 0, 0x80000000); + ok(status == STATUS_INVALID_INFO_CLASS, "Expected STATUS_INVALID_INFO_CLASS, got 0x%lx\n", status); + TestFileFsDeviceInformation(handle); TestFileFsVolumeInformation(handle); TestFileFsAttributeInformation(handle); diff --git a/modules/rostests/apitests/ntdll/NtSetInformationFile.c b/modules/rostests/apitests/ntdll/NtSetInformationFile.c new file mode 100644 index 0000000000..27afa45b4d --- /dev/null +++ b/modules/rostests/apitests/ntdll/NtSetInformationFile.c @@ -0,0 +1,19 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Test for NtSetInformationFile + * COPYRIGHT: Copyright 2019 Thomas Faber (thomas.faber(a)reactos.org) + */ + +#include "precomp.h" + +START_TEST(NtSetInformationFile) +{ + NTSTATUS Status; + + Status = NtSetInformationFile(NULL, NULL, NULL, 0, 0); + ok(Status == STATUS_INVALID_INFO_CLASS, "Status = %lx\n", Status); + + Status = NtSetInformationFile(NULL, NULL, NULL, 0, 0x80000000); + ok(Status == STATUS_INVALID_INFO_CLASS, "Status = %lx\n", Status); +} diff --git a/modules/rostests/apitests/ntdll/NtSetVolumeInformationFile.c b/modules/rostests/apitests/ntdll/NtSetVolumeInformationFile.c new file mode 100644 index 0000000000..7d75367067 --- /dev/null +++ b/modules/rostests/apitests/ntdll/NtSetVolumeInformationFile.c @@ -0,0 +1,19 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Test for NtSetVolumeInformationFile + * COPYRIGHT: Copyright 2019 Thomas Faber (thomas.faber(a)reactos.org) + */ + +#include "precomp.h" + +START_TEST(NtSetVolumeInformationFile) +{ + NTSTATUS Status; + + Status = NtSetVolumeInformationFile(NULL, NULL, NULL, 0, 0); + ok(Status == STATUS_INVALID_INFO_CLASS, "Status = %lx\n", Status); + + Status = NtSetVolumeInformationFile(NULL, NULL, NULL, 0, 0x80000000); + ok(Status == STATUS_INVALID_INFO_CLASS, "Status = %lx\n", Status); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index cd96ef8142..e627634de8 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -21,13 +21,17 @@ extern void func_NtOpenKey(void); extern void func_NtOpenProcessToken(void); extern void func_NtOpenThreadToken(void); extern void func_NtProtectVirtualMemory(void); +extern void func_NtQueryInformationFile(void); extern void func_NtQueryInformationProcess(void); extern void func_NtQueryKey(void); extern void func_NtQuerySystemEnvironmentValue(void); +extern void func_NtQuerySystemInformation(void); extern void func_NtQueryVolumeInformationFile(void); extern void func_NtReadFile(void); extern void func_NtSaveKey(void); +extern void func_NtSetInformationFile(void); extern void func_NtSetValueKey(void); +extern void func_NtSetVolumeInformationFile(void); extern void func_NtSystemInformation(void); extern void func_NtWriteFile(void); extern void func_RtlAllocateHeap(void); @@ -81,13 +85,17 @@ const struct test winetest_testlist[] = { "NtOpenProcessToken", func_NtOpenProcessToken }, { "NtOpenThreadToken", func_NtOpenThreadToken }, { "NtProtectVirtualMemory", func_NtProtectVirtualMemory }, + { "NtQueryInformationFile", func_NtQueryInformationFile }, { "NtQueryInformationProcess", func_NtQueryInformationProcess }, { "NtQueryKey", func_NtQueryKey }, { "NtQuerySystemEnvironmentValue", func_NtQuerySystemEnvironmentValue }, + { "NtQuerySystemInformation", func_NtQuerySystemInformation }, { "NtQueryVolumeInformationFile", func_NtQueryVolumeInformationFile }, { "NtReadFile", func_NtReadFile }, { "NtSaveKey", func_NtSaveKey}, + { "NtSetInformationFile", func_NtSetInformationFile }, { "NtSetValueKey", func_NtSetValueKey}, + { "NtSetVolumeInformationFile", func_NtSetVolumeInformationFile }, { "NtSystemInformation", func_NtSystemInformation }, { "NtWriteFile", func_NtWriteFile }, { "RtlAllocateHeap", func_RtlAllocateHeap },

1 0

[reactos] 01/02: [NTOSKRNL] Guard against negative InformationClass enum values. CORE-15651
by Thomas Faber 02 Feb '19

02 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63977328b1b163d2cadb0… commit 63977328b1b163d2cadb05b52330ae12910b7d98 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jan 19 11:35:18 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 2 22:50:02 2019 +0100 [NTOSKRNL] Guard against negative InformationClass enum values. CORE-15651 --- ntoskrnl/ex/sysinfo.c | 6 ++++-- ntoskrnl/io/iomgr/iofunc.c | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index a7883d4944..4949705ab2 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -2847,7 +2847,8 @@ NtQuerySystemInformation( /* * Check if the request is valid. */ - if (SystemInformationClass >= MAX_SYSTEM_INFO_CLASS) + if (SystemInformationClass < MIN_SYSTEM_INFO_CLASS || + SystemInformationClass >= MAX_SYSTEM_INFO_CLASS) { _SEH2_YIELD(return STATUS_INVALID_INFO_CLASS); } @@ -2871,7 +2872,8 @@ NtQuerySystemInformation( /* * Check if the request is valid. */ - if (SystemInformationClass >= MAX_SYSTEM_INFO_CLASS) + if (SystemInformationClass < MIN_SYSTEM_INFO_CLASS || + SystemInformationClass >= MAX_SYSTEM_INFO_CLASS) { _SEH2_YIELD(return STATUS_INVALID_INFO_CLASS); } diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index 61fd88f8fd..f2d3e59dd2 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -2158,7 +2158,8 @@ NtQueryInformationFile(IN HANDLE FileHandle, if (PreviousMode != KernelMode) { /* Validate the information class */ - if ((FileInformationClass >= FileMaximumInformation) || + if ((FileInformationClass < 0) || + (FileInformationClass >= FileMaximumInformation) || !(IopQueryOperationLength[FileInformationClass])) { /* Invalid class */ @@ -2192,7 +2193,8 @@ NtQueryInformationFile(IN HANDLE FileHandle, else { /* Validate the information class */ - if ((FileInformationClass >= FileMaximumInformation) || + if ((FileInformationClass < 0) || + (FileInformationClass >= FileMaximumInformation) || !(IopQueryOperationLength[FileInformationClass])) { /* Invalid class */ @@ -2959,7 +2961,8 @@ NtSetInformationFile(IN HANDLE FileHandle, if (PreviousMode != KernelMode) { /* Validate the information class */ - if ((FileInformationClass >= FileMaximumInformation) || + if ((FileInformationClass < 0) || + (FileInformationClass >= FileMaximumInformation) || !(IopSetOperationLength[FileInformationClass])) { /* Invalid class */ @@ -2995,7 +2998,8 @@ NtSetInformationFile(IN HANDLE FileHandle, else { /* Validate the information class */ - if ((FileInformationClass >= FileMaximumInformation) || + if ((FileInformationClass < 0) || + (FileInformationClass >= FileMaximumInformation) || !(IopSetOperationLength[FileInformationClass])) { /* Invalid class */ @@ -3991,7 +3995,8 @@ NtQueryVolumeInformationFile(IN HANDLE FileHandle, if (PreviousMode != KernelMode) { /* Validate the information class */ - if ((FsInformationClass >= FileFsMaximumInformation) || + if ((FsInformationClass < 0) || + (FsInformationClass >= FileFsMaximumInformation) || !(IopQueryFsOperationLength[FsInformationClass])) { /* Invalid class */ @@ -4163,7 +4168,8 @@ NtSetVolumeInformationFile(IN HANDLE FileHandle, if (PreviousMode != KernelMode) { /* Validate the information class */ - if ((FsInformationClass >= FileFsMaximumInformation) || + if ((FsInformationClass < 0) || + (FsInformationClass >= FileFsMaximumInformation) || !(IopSetFsOperationLength[FsInformationClass])) { /* Invalid class */

1 0

[reactos] 01/01: [RPCRT4][RPCRT4_WINETEST] Don't unset IDL_FLAGS. Fixes build on 64 bit hosts.
by Thomas Faber 02 Feb '19

02 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a14dcb53f192b429dd0f… commit 1a14dcb53f192b429dd0fee7406ada0a6d4e0c49 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 2 19:03:40 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 2 19:06:04 2019 +0100 [RPCRT4][RPCRT4_WINETEST] Don't unset IDL_FLAGS. Fixes build on 64 bit hosts. --- dll/win32/rpcrt4/CMakeLists.txt | 3 ++- modules/rostests/winetests/rpcrt4/CMakeLists.txt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dll/win32/rpcrt4/CMakeLists.txt b/dll/win32/rpcrt4/CMakeLists.txt index 212231a3a2..24c5d8fb40 100644 --- a/dll/win32/rpcrt4/CMakeLists.txt +++ b/dll/win32/rpcrt4/CMakeLists.txt @@ -14,9 +14,10 @@ spec2def(rpcrt4.dll rpcrt4.spec ADD_IMPORTLIB) add_rpc_files(client epm.idl) add_idl_headers(ndr_types_header ndr_types.idl) +set(OLD_IDL_FLAGS ${IDL_FLAGS}) set(IDL_FLAGS ${IDL_FLAGS} -Oicf) add_rpcproxy_files(ndr_types.idl) -unset(IDL_FLAGS) +set(IDL_FLAGS ${OLD_IDL_FLAGS}) list(APPEND SOURCE cproxy.c diff --git a/modules/rostests/winetests/rpcrt4/CMakeLists.txt b/modules/rostests/winetests/rpcrt4/CMakeLists.txt index dbb7cf7fc1..4eeac9d3af 100644 --- a/modules/rostests/winetests/rpcrt4/CMakeLists.txt +++ b/modules/rostests/winetests/rpcrt4/CMakeLists.txt @@ -7,10 +7,11 @@ add_definitions( -DPROXY_DELEGATION) include_directories(${CMAKE_CURRENT_BINARY_DIR}) +set(OLD_IDL_FLAGS ${IDL_FLAGS}) set(IDL_FLAGS ${IDL_FLAGS} --prefix-server=s_) add_rpc_files(client server.idl) add_rpc_files(server server.idl) -unset(IDL_FLAGS) +set(IDL_FLAGS ${OLD_IDL_FLAGS}) add_rpcproxy_files(cstub.idl) list(APPEND SOURCE

1 0

[reactos] 01/01: [SNDVOL32] Implement the mute checkbox. The tray dialog is done.
by Eric Kohl 02 Feb '19

02 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60c28213bcb42b5bb4052… commit 60c28213bcb42b5bb4052c723412730791c598fe Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 2 17:21:35 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 2 17:22:21 2019 +0100 [SNDVOL32] Implement the mute checkbox. The tray dialog is done. --- base/applications/sndvol32/tray.c | 68 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/base/applications/sndvol32/tray.c b/base/applications/sndvol32/tray.c index e871520d64..5970adcd21 100644 --- a/base/applications/sndvol32/tray.c +++ b/base/applications/sndvol32/tray.c @@ -20,6 +20,8 @@ typedef struct _DIALOG_DATA DWORD maxChannel; PMIXERCONTROLDETAILS_UNSIGNED volumeInitValues; PMIXERCONTROLDETAILS_UNSIGNED volumeCurrentValues; + + DWORD muteControlID; } DIALOG_DATA, *PDIALOG_DATA; @@ -54,9 +56,6 @@ OnTrayInitDialog( x = ptCursor.x; SetWindowPos(hwnd, HWND_TOPMOST, x, y, 0, 0, SWP_NOSIZE); - - /* Disable the controls for now */ - EnableWindow(GetDlgItem(hwnd, IDC_LINE_SWITCH), FALSE); } @@ -70,6 +69,7 @@ OnTrayInitMixer( MIXERCONTROL mxc; MIXERLINECONTROLS mxlctrl; MIXERCONTROLDETAILS mxcd; + MIXERCONTROLDETAILS_BOOLEAN mxcdBool; DWORD i; /* Open the mixer */ @@ -140,6 +140,63 @@ OnTrayInitMixer( SendDlgItemMessage(hwndDlg, IDC_LINE_SLIDER_VERT, TBM_SETRANGE, TRUE, MAKELONG(VOLUME_MIN, VOLUME_MAX)); SendDlgItemMessage(hwndDlg, IDC_LINE_SLIDER_VERT, TBM_SETPAGESIZE, 0, VOLUME_PAGE_SIZE); SendDlgItemMessage(hwndDlg, IDC_LINE_SLIDER_VERT, TBM_SETPOS, TRUE, VOLUME_MAX -(pDialogData->maxVolume - pDialogData->volumeMinimum) / pDialogData->volumeStep); + + /* Retrieve the mute control information */ + mxlctrl.cbStruct = sizeof(MIXERLINECONTROLS); + mxlctrl.dwLineID = mxln.dwLineID; + mxlctrl.dwControlType = MIXERCONTROL_CONTROLTYPE_MUTE; + mxlctrl.cControls = 1; + mxlctrl.cbmxctrl = sizeof(MIXERCONTROL); + mxlctrl.pamxctrl = &mxc; + + if (mixerGetLineControls((HMIXEROBJ)pDialogData->hMixer, &mxlctrl, MIXER_OBJECTF_HMIXER | MIXER_GETLINECONTROLSF_ONEBYTYPE) != MMSYSERR_NOERROR) + return; + + pDialogData->muteControlID = mxc.dwControlID; + + /* Retrieve the mute value */ + mxcd.cbStruct = sizeof(MIXERCONTROLDETAILS); + mxcd.dwControlID = mxc.dwControlID; + mxcd.cChannels = 1; + mxcd.cMultipleItems = 0; + mxcd.cbDetails = sizeof(MIXERCONTROLDETAILS_BOOLEAN); + mxcd.paDetails = &mxcdBool; + + if (mixerGetControlDetails((HMIXEROBJ)pDialogData->hMixer, &mxcd, MIXER_OBJECTF_HMIXER | MIXER_GETCONTROLDETAILSF_VALUE) != MMSYSERR_NOERROR) + return; + + /* Initialize the mute checkbox */ + SendDlgItemMessage(hwndDlg, IDC_LINE_SWITCH, BM_SETCHECK, (WPARAM)(mxcdBool.fValue ? BST_CHECKED : BST_UNCHECKED), 0); +} + + +static +VOID +OnCommand( + PDIALOG_DATA pDialogData, + HWND hwndDlg, + WPARAM wParam, + LPARAM lParam) +{ + MIXERCONTROLDETAILS mxcd; + MIXERCONTROLDETAILS_BOOLEAN mxcdMute; + + if ((LOWORD(wParam) == IDC_LINE_SWITCH) && + (HIWORD(wParam) == BN_CLICKED)) + { + mxcd.cbStruct = sizeof(MIXERCONTROLDETAILS); + mxcd.dwControlID = pDialogData->muteControlID; + mxcd.cChannels = 1; + mxcd.cMultipleItems = 0; + mxcd.cbDetails = sizeof(MIXERCONTROLDETAILS_BOOLEAN); + mxcd.paDetails = &mxcdMute; + + mxcdMute.fValue = (SendMessage((HWND)lParam, BM_GETCHECK, 0, 0) == BST_CHECKED); + + mixerSetControlDetails((HMIXEROBJ)pDialogData->hMixer, + &mxcd, + MIXER_OBJECTF_HMIXER | MIXER_SETCONTROLDETAILSF_VALUE); + } } @@ -221,6 +278,11 @@ TrayDlgProc( OnTrayInitMixer(pDialogData, hwndDlg); break; + case WM_COMMAND: + if (pDialogData) + OnCommand(pDialogData, hwndDlg, wParam, lParam); + break; + case WM_VSCROLL: if (pDialogData) OnVScroll(pDialogData, hwndDlg, wParam, lParam);

1 0

[reactos] 01/01: [UNIATA] Add AHCI revision 1.3.1
by Alexandr A. Telyatnikov 02 Feb '19

02 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c7e9684bd25d5d54cee2… commit 0c7e9684bd25d5d54cee2840f78bca60e46ede7d Author: Alexandr A. Telyatnikov <alter(a)alter.org.ua> AuthorDate: Sat Feb 2 01:18:15 2019 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Feb 2 15:47:39 2019 +0100 [UNIATA] Add AHCI revision 1.3.1 Also explicitly print current AHCI revision in debug log. CORE-15643 --- drivers/storage/ide/uniata/id_sata.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/storage/ide/uniata/id_sata.cpp b/drivers/storage/ide/uniata/id_sata.cpp index 6a16c16f09..25fa089ea8 100644 --- a/drivers/storage/ide/uniata/id_sata.cpp +++ b/drivers/storage/ide/uniata/id_sata.cpp @@ -869,11 +869,12 @@ UniAtaAhciValidateVersion( case 0x00010100: case 0x00010200: case 0x00010300: + case 0x00010301: break; default: KdPrint2((PRINT_PREFIX " Unknown AHCI revision\n")); if(AtapiRegCheckDevValue(deviceExtension, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"CheckAhciRevision", Strict)) { - KdPrint((" AHCI revision excluded\n")); + KdPrint((" AHCI revision excluded %#x\n", version)); return FALSE; } } @@ -966,7 +967,7 @@ UniataAhciDetect( CAP = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_CAP); CAP2 = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_CAP2); - KdPrint2((PRINT_PREFIX " AHCI CAP %#x, CAP2 %#x\n", CAP, CAP2)); + KdPrint2((PRINT_PREFIX " AHCI CAP %#x, CAP2 %#x, ver %#x\n", CAP, CAP2, version)); if(CAP & AHCI_CAP_S64A) { KdPrint2((PRINT_PREFIX " 64bit")); //deviceExtension->Host64 = TRUE; // this is just DETECT, do not update anything

1 0

[reactos] 01/01: [SETUPAPI] Add a stub for SetupDiDeleteDeviceInterfaceData to make the wine tests work.
by Eric Kohl 02 Feb '19

02 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8687529bdf85d7654e5e5… commit 8687529bdf85d7654e5e5cf06d02bab631f89279 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 2 15:13:35 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 2 15:13:35 2019 +0100 [SETUPAPI] Add a stub for SetupDiDeleteDeviceInterfaceData to make the wine tests work. --- dll/win32/setupapi/interface.c | 14 ++++++++++++++ dll/win32/setupapi/setupapi.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dll/win32/setupapi/interface.c b/dll/win32/setupapi/interface.c index 172d045018..f080d51828 100644 --- a/dll/win32/setupapi/interface.c +++ b/dll/win32/setupapi/interface.c @@ -627,3 +627,17 @@ SetupDiOpenDeviceInterfaceRegKey( return hKey; } + +/*********************************************************************** + * SetupDiDeleteDeviceInterfaceData (SETUPAPI.@) + */ +BOOL +WINAPI +SetupDiDeleteDeviceInterfaceData( + HDEVINFO DeviceInfoSet, + PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) +{ + FIXME("SetupDiDeleteDeviceInterfaceData(%p %p) stub\n", + DeviceInfoSet, DeviceInterfaceData); + return TRUE; +} diff --git a/dll/win32/setupapi/setupapi.spec b/dll/win32/setupapi/setupapi.spec index 99de0fca82..bfe00fa114 100644 --- a/dll/win32/setupapi/setupapi.spec +++ b/dll/win32/setupapi/setupapi.spec @@ -281,7 +281,7 @@ @ stdcall SetupDiCreateDeviceInterfaceW(ptr ptr ptr wstr long ptr) @ stdcall SetupDiDeleteDevRegKey(ptr ptr long long long) @ stdcall SetupDiDeleteDeviceInfo(long ptr) -@ stub SetupDiDeleteDeviceInterfaceData +@ stdcall SetupDiDeleteDeviceInterfaceData(ptr ptr) @ stdcall SetupDiDeleteDeviceInterfaceRegKey(ptr ptr long) @ stdcall SetupDiDestroyClassImageList(ptr) @ stdcall SetupDiDestroyDeviceInfoList(long)

1 0

[reactos] 01/01: [SNDVOL32] Implement the volume control for the tray window.
by Eric Kohl 02 Feb '19

02 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c73c7cc16efa53e9208ac… commit c73c7cc16efa53e9208acd64d1931c4a806e8692 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 2 14:43:30 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 2 14:44:14 2019 +0100 [SNDVOL32] Implement the volume control for the tray window. --- base/applications/sndvol32/tray.c | 187 +++++++++++++++++++++++++++++++++++++- 1 file changed, 186 insertions(+), 1 deletion(-) diff --git a/base/applications/sndvol32/tray.c b/base/applications/sndvol32/tray.c index 2223aadaef..e871520d64 100644 --- a/base/applications/sndvol32/tray.c +++ b/base/applications/sndvol32/tray.c @@ -7,6 +7,22 @@ #include "sndvol32.h" +typedef struct _DIALOG_DATA +{ + HMIXER hMixer; + DWORD volumeControlID; + DWORD volumeChannels; + DWORD volumeMinimum; + DWORD volumeMaximum; + DWORD volumeStep; + + DWORD maxVolume; + DWORD maxChannel; + PMIXERCONTROLDETAILS_UNSIGNED volumeInitValues; + PMIXERCONTROLDETAILS_UNSIGNED volumeCurrentValues; +} DIALOG_DATA, *PDIALOG_DATA; + + static VOID OnTrayInitDialog( HWND hwnd, @@ -40,11 +56,147 @@ OnTrayInitDialog( SetWindowPos(hwnd, HWND_TOPMOST, x, y, 0, 0, SWP_NOSIZE); /* Disable the controls for now */ - EnableWindow(GetDlgItem(hwnd, IDC_LINE_SLIDER_VERT), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_LINE_SWITCH), FALSE); } +static +VOID +OnTrayInitMixer( + PDIALOG_DATA pDialogData, + HWND hwndDlg) +{ + MIXERLINE mxln; + MIXERCONTROL mxc; + MIXERLINECONTROLS mxlctrl; + MIXERCONTROLDETAILS mxcd; + DWORD i; + + /* Open the mixer */ + if (mixerOpen(&pDialogData->hMixer, 0, PtrToUlong(hwndDlg), 0, MIXER_OBJECTF_MIXER | CALLBACK_WINDOW) != MMSYSERR_NOERROR) + return; + + /* Retrieve the mixer information */ + mxln.cbStruct = sizeof(MIXERLINE); + mxln.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_SPEAKERS; + + if (mixerGetLineInfo((HMIXEROBJ)pDialogData->hMixer, &mxln, MIXER_OBJECTF_HMIXER | MIXER_GETLINEINFOF_COMPONENTTYPE) != MMSYSERR_NOERROR) + return; + + pDialogData->volumeChannels = mxln.cChannels; + + /* Retrieve the line information */ + mxlctrl.cbStruct = sizeof(MIXERLINECONTROLS); + mxlctrl.dwLineID = mxln.dwLineID; + mxlctrl.dwControlType = MIXERCONTROL_CONTROLTYPE_VOLUME; + mxlctrl.cControls = 1; + mxlctrl.cbmxctrl = sizeof(MIXERCONTROL); + mxlctrl.pamxctrl = &mxc; + + if (mixerGetLineControls((HMIXEROBJ)pDialogData->hMixer, &mxlctrl, MIXER_OBJECTF_HMIXER | MIXER_GETLINECONTROLSF_ONEBYTYPE) != MMSYSERR_NOERROR) + return; + + pDialogData->volumeControlID = mxc.dwControlID; + pDialogData->volumeMinimum = mxc.Bounds.dwMinimum; + pDialogData->volumeMaximum = mxc.Bounds.dwMaximum; + pDialogData->volumeStep = (pDialogData->volumeMaximum - pDialogData->volumeMinimum) / (VOLUME_MAX - VOLUME_MIN); + + /* Allocate a buffer for all channel volume values */ + pDialogData->volumeInitValues = HeapAlloc(GetProcessHeap(), + 0, + mxln.cChannels * sizeof(MIXERCONTROLDETAILS_UNSIGNED)); + if (pDialogData->volumeInitValues == NULL) + return; + + pDialogData->volumeCurrentValues = HeapAlloc(GetProcessHeap(), + 0, + mxln.cChannels * sizeof(MIXERCONTROLDETAILS_UNSIGNED)); + if (pDialogData->volumeCurrentValues == NULL) + return; + + /* Retrieve the channel volume values */ + mxcd.cbStruct = sizeof(MIXERCONTROLDETAILS); + mxcd.dwControlID = mxc.dwControlID; + mxcd.cChannels = mxln.cChannels; + mxcd.cMultipleItems = 0; + mxcd.cbDetails = sizeof(MIXERCONTROLDETAILS_UNSIGNED); + mxcd.paDetails = pDialogData->volumeInitValues; + + if (mixerGetControlDetails((HMIXEROBJ)pDialogData->hMixer, &mxcd, MIXER_OBJECTF_HMIXER | MIXER_GETCONTROLDETAILSF_VALUE) != MMSYSERR_NOERROR) + return; + + pDialogData->maxVolume = pDialogData->volumeInitValues[0].dwValue; + pDialogData->maxChannel = 0; + for (i = 1; i < pDialogData->volumeChannels; i++) + { + if (pDialogData->volumeInitValues[i].dwValue > pDialogData->maxVolume) + { + pDialogData->maxVolume = pDialogData->volumeInitValues[i].dwValue; + pDialogData->maxChannel = i; + } + } + + /* Initialize the volume trackbar */ + SendDlgItemMessage(hwndDlg, IDC_LINE_SLIDER_VERT, TBM_SETRANGE, TRUE, MAKELONG(VOLUME_MIN, VOLUME_MAX)); + SendDlgItemMessage(hwndDlg, IDC_LINE_SLIDER_VERT, TBM_SETPAGESIZE, 0, VOLUME_PAGE_SIZE); + SendDlgItemMessage(hwndDlg, IDC_LINE_SLIDER_VERT, TBM_SETPOS, TRUE, VOLUME_MAX -(pDialogData->maxVolume - pDialogData->volumeMinimum) / pDialogData->volumeStep); +} + + +static +VOID +OnVScroll( + PDIALOG_DATA pDialogData, + HWND hwndDlg, + WPARAM wParam, + LPARAM lParam) +{ + MIXERCONTROLDETAILS mxcd; + DWORD dwPos, dwVolume, i; + + switch (LOWORD(wParam)) + { + case TB_THUMBTRACK: + + dwPos = VOLUME_MAX - (DWORD)SendDlgItemMessage(hwndDlg, IDC_LINE_SLIDER_VERT, TBM_GETPOS, 0, 0); + dwVolume = (dwPos * pDialogData->volumeStep) + pDialogData->volumeMinimum; + + for (i = 0; i < pDialogData->volumeChannels; i++) + { + if (i == pDialogData->maxChannel) + { + pDialogData->volumeCurrentValues[i].dwValue = dwVolume; + } + else + { + pDialogData->volumeCurrentValues[i].dwValue = + pDialogData->volumeInitValues[i].dwValue * dwVolume / pDialogData-> maxVolume; + } + } + + mxcd.cbStruct = sizeof(MIXERCONTROLDETAILS); + mxcd.dwControlID = pDialogData->volumeControlID; + mxcd.cChannels = pDialogData->volumeChannels; + mxcd.cMultipleItems = 0; + mxcd.cbDetails = sizeof(MIXERCONTROLDETAILS_UNSIGNED); + mxcd.paDetails = pDialogData->volumeCurrentValues; + + mixerSetControlDetails((HMIXEROBJ)pDialogData->hMixer, + &mxcd, + MIXER_OBJECTF_HMIXER | MIXER_SETCONTROLDETAILSF_VALUE); + break; + + case TB_ENDTRACK: + PlaySound((LPCTSTR)SND_ALIAS_SYSTEMDEFAULT, NULL, SND_ASYNC | SND_ALIAS_ID); + break; + + default: + break; + } +} + + + INT_PTR CALLBACK TrayDlgProc( @@ -53,10 +205,43 @@ TrayDlgProc( WPARAM wParam, LPARAM lParam) { + PDIALOG_DATA pDialogData; + + pDialogData = (PDIALOG_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch (uMsg) { case WM_INITDIALOG: OnTrayInitDialog(hwndDlg, wParam, lParam); + + pDialogData = (PDIALOG_DATA)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DIALOG_DATA)); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pDialogData); + + if (pDialogData) + OnTrayInitMixer(pDialogData, hwndDlg); + break; + + case WM_VSCROLL: + if (pDialogData) + OnVScroll(pDialogData, hwndDlg, wParam, lParam); + break; + + case WM_DESTROY: + if (pDialogData) + { + if (pDialogData->volumeInitValues) + HeapFree(GetProcessHeap(), 0, pDialogData->volumeInitValues); + + if (pDialogData->volumeCurrentValues) + HeapFree(GetProcessHeap(), 0, pDialogData->volumeCurrentValues); + + if (pDialogData->hMixer) + mixerClose(pDialogData->hMixer); + + HeapFree(GetProcessHeap(), 0, pDialogData); + pDialogData = NULL; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)NULL); + } break; case WM_ACTIVATE:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs