Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 71152: [NTDLL_APITEST] - Add a test for NtQueryInformationProcess:ProcessTimes CORE-7007
by tfaber＠svn.reactos.org 12 Apr '16

12 Apr '16

Author: tfaber Date: Tue Apr 12 17:39:01 2016 New Revision: 71152 URL: http://svn.reactos.org/svn/reactos?rev=71152&view=rev Log: [NTDLL_APITEST] - Add a test for NtQueryInformationProcess:ProcessTimes CORE-7007 Added: trunk/rostests/apitests/ntdll/NtQueryInformationProcess.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Tue Apr 12 17:39:01 2016 @@ -13,6 +13,7 @@ NtOpenProcessToken.c NtOpenThreadToken.c NtProtectVirtualMemory.c + NtQueryInformationProcess.c NtQueryKey.c NtQuerySystemEnvironmentValue.c NtQueryVolumeInformationFile.c Added: trunk/rostests/apitests/ntdll/NtQueryInformationProcess.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtQueryInf… ============================================================================== --- trunk/rostests/apitests/ntdll/NtQueryInformationProcess.c (added) +++ trunk/rostests/apitests/ntdll/NtQueryInformationProcess.c [iso-8859-1] Tue Apr 12 17:39:01 2016 @@ -0,0 +1,197 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING in the top level directory + * PURPOSE: Tests for the NtQueryInformationProcess API + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <ndk/rtlfuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/psfuncs.h> + +static LARGE_INTEGER TestStartTime; + +static +void +Test_ProcessTimes(void) +{ +#define SPIN_TIME 1000000 + NTSTATUS Status; + KERNEL_USER_TIMES Times1; + KERNEL_USER_TIMES Times2; + ULONG Length; + LARGE_INTEGER Time1, Time2; + + /* Everything is NULL */ + Status = NtQueryInformationProcess(NULL, + ProcessTimes, + NULL, + 0, + NULL); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* Right size, invalid process */ + Status = NtQueryInformationProcess(NULL, + ProcessTimes, + NULL, + sizeof(KERNEL_USER_TIMES), + NULL); + ok_hex(Status, STATUS_INVALID_HANDLE); + + /* Valid process, no buffer */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessTimes, + NULL, + 0, + NULL); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* Unaligned buffer, wrong size */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessTimes, + (PVOID)2, + 0, + NULL); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* Unaligned buffer, correct size */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessTimes, + (PVOID)2, + sizeof(KERNEL_USER_TIMES), + NULL); + ok_hex(Status, STATUS_DATATYPE_MISALIGNMENT); + + /* Buffer too small */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessTimes, + NULL, + sizeof(KERNEL_USER_TIMES) - 1, + NULL); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* Right buffer size but NULL pointer */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessTimes, + NULL, + sizeof(KERNEL_USER_TIMES), + NULL); + ok_hex(Status, STATUS_ACCESS_VIOLATION); + + /* Buffer too large */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessTimes, + NULL, + sizeof(KERNEL_USER_TIMES) + 1, + NULL); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* Buffer too small, ask for length */ + Length = 0x55555555; + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessTimes, + NULL, + sizeof(KERNEL_USER_TIMES) - 1, + &Length); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + ok_dec(Length, 0x55555555); + + Status = NtQuerySystemTime(&Time1); + ok_hex(Status, STATUS_SUCCESS); + + /* Do some busy waiting to increase UserTime */ + do + { + Status = NtQuerySystemTime(&Time2); + if (!NT_SUCCESS(Status)) + { + ok(0, "NtQuerySystemTime failed with %lx\n", Status); + break; + } + } while (Time2.QuadPart - Time1.QuadPart < SPIN_TIME); + + /* Valid parameters, no return length */ + Status = NtQuerySystemTime(&Time1); + ok_hex(Status, STATUS_SUCCESS); + + RtlFillMemory(&Times1, sizeof(Times1), 0x55); + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessTimes, + &Times1, + sizeof(KERNEL_USER_TIMES), + NULL); + ok_hex(Status, STATUS_SUCCESS); + ok(Times1.CreateTime.QuadPart < TestStartTime.QuadPart, + "CreateTime is %I64u, expected < %I64u\n", Times1.CreateTime.QuadPart, TestStartTime.QuadPart); + ok(Times1.CreateTime.QuadPart > TestStartTime.QuadPart - 100000000LL, + "CreateTime is %I64u, expected > %I64u\n", Times1.CreateTime.QuadPart, TestStartTime.QuadPart - 100000000LL); + ok(Times1.ExitTime.QuadPart == 0, + "ExitTime is %I64u, expected 0\n", Times1.ExitTime.QuadPart); + ok(Times1.KernelTime.QuadPart != 0, "KernelTime is 0\n"); + ok(Times1.UserTime.QuadPart != 0, "UserTime is 0\n"); + + /* Do some busy waiting to increase UserTime */ + do + { + Status = NtQuerySystemTime(&Time2); + if (!NT_SUCCESS(Status)) + { + ok(0, "NtQuerySystemTime failed with %lx\n", Status); + break; + } + } while (Time2.QuadPart - Time1.QuadPart < SPIN_TIME); + + /* Again, this time with a return length */ + Length = 0x55555555; + RtlFillMemory(&Times2, sizeof(Times2), 0x55); + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessTimes, + &Times2, + sizeof(KERNEL_USER_TIMES), + &Length); + ok_hex(Status, STATUS_SUCCESS); + ok_dec(Length, sizeof(KERNEL_USER_TIMES)); + ok(Times1.CreateTime.QuadPart == Times2.CreateTime.QuadPart, + "CreateTimes not equal: %I64u != %I64u\n", Times1.CreateTime.QuadPart, Times2.CreateTime.QuadPart); + ok(Times2.ExitTime.QuadPart == 0, + "ExitTime is %I64u, expected 0\n", Times2.ExitTime.QuadPart); + ok(Times2.KernelTime.QuadPart != 0, "KernelTime is 0\n"); + ok(Times2.UserTime.QuadPart != 0, "UserTime is 0\n"); + + /* Compare the two sets of KernelTime/UserTime values */ + Status = NtQuerySystemTime(&Time2); + ok_hex(Status, STATUS_SUCCESS); + /* Time values must have increased */ + ok(Times2.KernelTime.QuadPart > Times1.KernelTime.QuadPart, + "KernelTime values inconsistent. Expected %I64u > %I64u\n", Times2.KernelTime.QuadPart, Times1.KernelTime.QuadPart); + ok(Times2.UserTime.QuadPart > Times1.UserTime.QuadPart, + "UserTime values inconsistent. Expected %I64u > %I64u\n", Times2.UserTime.QuadPart, Times1.UserTime.QuadPart); + /* They can't have increased by more than wall clock time difference (we only have one thread) */ + ok(Times2.KernelTime.QuadPart - Times1.KernelTime.QuadPart < Time2.QuadPart - Time1.QuadPart, + "KernelTime values inconsistent. Expected %I64u - %I64u < %I64u\n", + Times2.KernelTime.QuadPart, Times1.KernelTime.QuadPart, Time2.QuadPart - Time1.QuadPart); + ok(Times2.UserTime.QuadPart - Times1.UserTime.QuadPart < Time2.QuadPart - Time1.QuadPart, + "UserTime values inconsistent. Expected %I64u - %I64u < %I64u\n", + Times2.UserTime.QuadPart, Times1.UserTime.QuadPart, Time2.QuadPart - Time1.QuadPart); + + trace("KernelTime1 = %I64u\n", Times1.KernelTime.QuadPart); + trace("KernelTime2 = %I64u\n", Times2.KernelTime.QuadPart); + trace("UserTime1 = %I64u\n", Times1.UserTime.QuadPart); + trace("UserTime2 = %I64u\n", Times2.UserTime.QuadPart); + + /* TODO: Test ExitTime on a terminated process */ +#undef SPIN_TIME +} + +START_TEST(NtQueryInformationProcess) +{ + NTSTATUS Status; + + Status = NtQuerySystemTime(&TestStartTime); + ok_hex(Status, STATUS_SUCCESS); + + Test_ProcessTimes(); +} Propchange: trunk/rostests/apitests/ntdll/NtQueryInformationProcess.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Tue Apr 12 17:39:01 2016 @@ -16,6 +16,7 @@ extern void func_NtOpenProcessToken(void); extern void func_NtOpenThreadToken(void); extern void func_NtProtectVirtualMemory(void); +extern void func_NtQueryInformationProcess(void); extern void func_NtQueryKey(void); extern void func_NtQuerySystemEnvironmentValue(void); extern void func_NtQueryVolumeInformationFile(void); @@ -57,6 +58,7 @@ { "NtOpenProcessToken", func_NtOpenProcessToken }, { "NtOpenThreadToken", func_NtOpenThreadToken }, { "NtProtectVirtualMemory", func_NtProtectVirtualMemory }, + { "NtQueryInformationProcess", func_NtQueryInformationProcess }, { "NtQueryKey", func_NtQueryKey }, { "NtQuerySystemEnvironmentValue", func_NtQuerySystemEnvironmentValue }, { "NtQueryVolumeInformationFile", func_NtQueryVolumeInformationFile },

1 0

[tfaber] 71151: [ACPICA] - Update to version 20160318 CORE-11114 #resolve
by tfaber＠svn.reactos.org 12 Apr '16

12 Apr '16

Author: tfaber Date: Tue Apr 12 15:44:33 2016 New Revision: 71151 URL: http://svn.reactos.org/svn/reactos?rev=71151&view=rev Log: [ACPICA] - Update to version 20160318 CORE-11114 #resolve Added: trunk/reactos/drivers/bus/acpi/acpica/executer/exconcat.c (with props) trunk/reactos/drivers/bus/acpi/acpica/include/platform/acqnx.h (with props) Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmethod.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsobject.c trunk/reactos/drivers/bus/acpi/acpica/events/evgpeblk.c trunk/reactos/drivers/bus/acpi/acpica/events/evgpeinit.c trunk/reactos/drivers/bus/acpi/acpica/events/evregion.c trunk/reactos/drivers/bus/acpi/acpica/events/evrgnini.c trunk/reactos/drivers/bus/acpi/acpica/executer/exconfig.c trunk/reactos/drivers/bus/acpi/acpica/executer/exconvrt.c trunk/reactos/drivers/bus/acpi/acpica/executer/exdump.c trunk/reactos/drivers/bus/acpi/acpica/executer/exmisc.c trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg3.c trunk/reactos/drivers/bus/acpi/acpica/executer/exsystem.c trunk/reactos/drivers/bus/acpi/acpica/executer/exutils.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwregs.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxface.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxfsleep.c trunk/reactos/drivers/bus/acpi/acpica/include/acdebug.h trunk/reactos/drivers/bus/acpi/acpica/include/acdisasm.h trunk/reactos/drivers/bus/acpi/acpica/include/acevents.h trunk/reactos/drivers/bus/acpi/acpica/include/acglobal.h trunk/reactos/drivers/bus/acpi/acpica/include/acinterp.h trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h trunk/reactos/drivers/bus/acpi/acpica/include/acmacros.h trunk/reactos/drivers/bus/acpi/acpica/include/acnamesp.h trunk/reactos/drivers/bus/acpi/acpica/include/acoutput.h trunk/reactos/drivers/bus/acpi/acpica/include/acparser.h trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h trunk/reactos/drivers/bus/acpi/acpica/include/acpredef.h trunk/reactos/drivers/bus/acpi/acpica/include/acresrc.h trunk/reactos/drivers/bus/acpi/acpica/include/acstruct.h trunk/reactos/drivers/bus/acpi/acpica/include/actbl.h trunk/reactos/drivers/bus/acpi/acpica/include/actbl1.h trunk/reactos/drivers/bus/acpi/acpica/include/actbl2.h trunk/reactos/drivers/bus/acpi/acpica/include/actbl3.h trunk/reactos/drivers/bus/acpi/acpica/include/actypes.h trunk/reactos/drivers/bus/acpi/acpica/include/acutils.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acenv.h trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsconvert.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdump.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nseval.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsinit.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsload.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsprepkg.c trunk/reactos/drivers/bus/acpi/acpica/parser/psargs.c trunk/reactos/drivers/bus/acpi/acpica/parser/psopinfo.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsdump.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsutils.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbfadt.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbinstal.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbprint.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfload.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utcache.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utdebug.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utdecode.c trunk/reactos/drivers/bus/acpi/acpica/utilities/uteval.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utglobal.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utmisc.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utnonansi.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utprint.c trunk/reactos/drivers/bus/acpi/acpica/utilities/uttrack.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utxferror.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utxfinit.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeList… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmethod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evgpeblk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evgpeinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evregion.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evrgnini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Added: trunk/reactos/drivers/bus/acpi/acpica/executer/exconcat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exconvrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exsystem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwregs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxfsleep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acdisasm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acevents.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acglobal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acinterp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acmacros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acnamesp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acoutput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acparser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpredef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acresrc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acstruct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actbl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actbl1.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actbl2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actbl3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acenv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Added: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acqnx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsconvert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nseval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsprepkg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psopinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbfadt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbinstal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utdecode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/uteval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utglobal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utnonansi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/uttrack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utxferror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utxfinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut…

1 0

[tfaber] 71150: [COM_APITEST] - Add some more classes, thanks to http://www.geoffchappell.com/studies/windows/ie/browseui/classes/index.htm
by tfaber＠svn.reactos.org 12 Apr '16

12 Apr '16

Author: tfaber Date: Tue Apr 12 13:18:32 2016 New Revision: 71150 URL: http://svn.reactos.org/svn/reactos?rev=71150&view=rev Log: [COM_APITEST] - Add some more classes, thanks to http://www.geoffchappell.com/studies/windows/ie/browseui/classes/index.htm Modified: trunk/rostests/apitests/com/browseui.c trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/shell32.c Modified: trunk/rostests/apitests/com/browseui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/browseui.c?r… ============================================================================== --- trunk/rostests/apitests/com/browseui.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/browseui.c [iso-8859-1] Tue Apr 12 13:18:32 2016 @@ -13,6 +13,29 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { { + ID_NAME(CLSID_ACLCustomMRU), + { + { 0x0, &IID_IEnumString }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IACList }, + }, + }, + { + ID_NAME(CLSID_ACLHistory), + { + { 0x0, &IID_IEnumString }, + { 0x0, &IID_IUnknown }, + }, + }, + { + ID_NAME(CLSID_ACLMRU), + { + { 0x0, &IID_IEnumString }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IACList }, + }, + }, + { ID_NAME(CLSID_ACLMulti), { { 0x0, &IID_IEnumString }, @@ -93,6 +116,16 @@ { { 0x0, &IID_IBandProxy }, { 0x0, &IID_IUnknown }, + } + }, + { + ID_NAME(CLSID_BandSiteMenu), + { + { 0x0, &IID_IContextMenu3 }, + { 0x0, &IID_IContextMenu2 }, + { 0x0, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellService }, } }, { @@ -113,14 +146,23 @@ } }, { - ID_NAME(CLSID_BandSiteMenu), - { - { 0x0, &IID_IContextMenu3 }, - { 0x0, &IID_IContextMenu2 }, - { 0x0, &IID_IContextMenu }, - { 0x0, &IID_IUnknown }, - { 0x4, &IID_IShellService }, - } + ID_NAME(CLSID_BrowserBand), + { + { -0x30, &IID_IDeskBand }, + { -0x30, &IID_IDockingWindow }, + { -0x30, &IID_IOleWindow }, + { -0x2c, &IID_IObjectWithSite }, + { -0x24, &IID_IInputObject }, + { -0x20, &IID_IPersistStream }, + { -0x20, &IID_IPersist }, + { -0x1c, &IID_IOleCommandTarget }, + { -0x18, &IID_IServiceProvider }, + { 0x0, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IWinEventHandler }, + { 0x8, &IID_IDispatch }, + { 0x10, &IID_IPersistPropertyBag }, + }, }, { ID_NAME(CLSID_CCommonBrowser), @@ -141,12 +183,38 @@ } }, { + ID_NAME(CLSID_CDockingBarPropertyBag), + { + { 0x0, &IID_IPropertyBag }, + { 0x0, &IID_IUnknown }, + }, + }, + { ID_NAME(CLSID_CRegTreeOptions), { { 0x0, &IID_IRegTreeOptions }, { 0x0, &IID_IUnknown }, { 0x4, &IID_IObjectWithSite }, } + }, + { + ID_NAME(CLSID_CommBand), + { + { -0x30, &IID_IDeskBand }, + { -0x30, &IID_IDockingWindow }, + { -0x30, &IID_IOleWindow }, + { -0x2c, &IID_IObjectWithSite }, + { -0x24, &IID_IInputObject }, + { -0x20, &IID_IPersistStream }, + { -0x20, &IID_IPersist }, + { -0x1c, &IID_IOleCommandTarget }, + { -0x18, &IID_IServiceProvider }, + { 0x0, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IWinEventHandler }, + { 0x8, &IID_IDispatch }, + { 0x10, &IID_IPersistPropertyBag }, + }, }, { ID_NAME(CLSID_DeskBar), @@ -192,6 +260,23 @@ { { 0x0, &IID_IGlobalFolderSettings }, { 0x0, &IID_IUnknown }, + }, + L"Both" + }, + { + ID_NAME(CLSID_ImageListCache), + { + { 0x0, &IID_IUnknown }, + }, + L"Both" + }, + { + ID_NAME(CLSID_ImgCtxThumbnailExtractor), + { + { 0x0, &IID_IExtractImage2 }, + { 0x0, &IID_IExtractImage }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IPersistFile }, }, L"Both" }, @@ -298,6 +383,28 @@ { 0x4, &IID_IObjectWithSite }, } }, + { + ID_NAME(CLSID_ShellTaskScheduler), + { + { 0x0, &IID_IShellTaskScheduler }, + { 0x0, &IID_IUnknown }, + }, + }, + { + ID_NAME(CLSID_UserAssist), + { + { 0x0, &IID_IUnknown }, + }, + L"Both" + }, + { + ID_NAME(CLSID_WebSearchExt), + { + { 0x0, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IObjectWithSite }, + }, + }, }; static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Tue Apr 12 13:18:32 2016 @@ -176,6 +176,8 @@ { ID_NAME(IID_IInputObject) }, { ID_NAME(IID_IInputObjectSite) }, { ID_NAME(IID_IInternalUnknown), TRUE }, + { ID_NAME(IID_IInternetSecurityManager) }, + { ID_NAME(IID_IInternetZoneManager), TRUE }, { ID_NAME(IID_IItemNameLimits) }, { ID_NAME(IID_IMarshal) }, { ID_NAME(IID_IMarshal2), TRUE }, Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Tue Apr 12 13:18:32 2016 @@ -77,14 +77,19 @@ DEFINE_GUID(CLSID_ActiveDesktop, 0x75048700, 0xef1f, 0x11d0, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9); DEFINE_GUID(CLSID_AugmentedShellFolder, 0x91ea3f8b, 0xc99b, 0x11d0, 0x98, 0x15, 0x00, 0xc0, 0x4f, 0xd9, 0x19, 0x72); DEFINE_GUID(CLSID_AugmentedShellFolder2, 0x6413ba2c, 0xb461, 0x11d1, 0xa1, 0x8a, 0x08, 0x00, 0x36, 0xb1, 0x1a, 0x03); +DEFINE_GUID(CLSID_BrowserBand, 0x7ba4c742, 0x9e81, 0x11cf, 0x99, 0xd3, 0x00, 0xaa, 0x00, 0x4a, 0xe8, 0x37); +DEFINE_GUID(CLSID_CDBurn, 0xfbeb8a05, 0xbeee, 0x4442, 0x80, 0x4e, 0x40, 0x9d, 0x6c, 0x45, 0x15, 0xe9); +DEFINE_GUID(CLSID_CDockingBarPropertyBag, 0x4af4a5fc, 0x912a, 0x11d1, 0xb9, 0x45, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1); +DEFINE_GUID(CLSID_CommBand, 0x4d5c8c2a, 0xd075, 0x11d0, 0xb4, 0x16, 0x00, 0xc0, 0x4f, 0xb9, 0x03, 0x76); DEFINE_GUID(CLSID_CopyToMenu, 0xC2FBB630, 0x2971, 0x11D1, 0xA1, 0x8C, 0x00, 0xC0, 0x4F, 0xD7, 0x5D, 0x13); -DEFINE_GUID(CLSID_CDBurn, 0xfbeb8a05, 0xbeee, 0x4442, 0x80, 0x4e, 0x40, 0x9d, 0x6c, 0x45, 0x15, 0xe9); DEFINE_GUID(CLSID_DeskMovr, 0x72267F6A, 0xA6F9, 0x11D0, 0xBC, 0x94, 0x00, 0xC0, 0x4F, 0xB6, 0x78, 0x63); DEFINE_GUID(CLSID_FadeTask, 0x7EB5FBE4, 0x2100, 0x49E6, 0x85, 0x93, 0x17, 0xE1, 0x30, 0x12, 0x2F, 0x91); DEFINE_GUID(CLSID_FolderItem, 0xfef10fa2, 0x355e, 0x4e06, 0x93, 0x81, 0x9b, 0x24, 0xd7, 0xf7, 0xcc, 0x88); DEFINE_GUID(CLSID_FolderItemsFDF, 0x53c74826, 0xab99, 0x4d33, 0xac, 0xa4, 0x31, 0x17, 0xf5, 0x1d, 0x37, 0x88); DEFINE_GUID(CLSID_FolderViewHost, 0x20b1cb23, 0x6968, 0x4eb9, 0xb7, 0xd4, 0xa6, 0x6d, 0x00, 0xd0, 0x7c, 0xee); DEFINE_GUID(CLSID_ISFBand, 0xD82BE2B0, 0x5764, 0x11D0, 0xA9, 0x6E, 0x00, 0xC0, 0x4F, 0xD7, 0x05, 0xA2); +DEFINE_GUID(CLSID_ImageListCache, 0x3f4eef80, 0xbfe8, 0x11d0, 0xa3, 0xa5, 0x00, 0xc0, 0x4f, 0xd7, 0x06, 0xec); +DEFINE_GUID(CLSID_ImgCtxThumbnailExtractor,0x7376d660, 0xc583, 0x11d0, 0xa3, 0xa5, 0x00, 0xc0, 0x4f, 0xd7, 0x06, 0xec); DEFINE_GUID(CLSID_MergedFolder, 0x26fdc864, 0xbe88, 0x46e7, 0x92, 0x35, 0x03, 0x2d, 0x8e, 0xa5, 0x16, 0x2e); DEFINE_GUID(CLSID_MenuDeskBar, 0xECD4FC4F, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); DEFINE_GUID(CLSID_MenuToolbarBase, 0x40b96610, 0xb522, 0x11d1, 0xb3, 0xb4, 0x00, 0xaa, 0x00, 0x6e, 0xfd, 0xe7); @@ -95,8 +100,12 @@ DEFINE_GUID(CLSID_ShellFolderView, 0x62112aa1, 0xebe4, 0x11cf, 0xa5, 0xfb, 0x00, 0x20, 0xaf, 0xe7, 0x29, 0x2d); DEFINE_GUID(CLSID_ShellImageDataFactory, 0x66e4e4fb, 0xf385, 0x4dd0, 0x8d, 0x74, 0xa2, 0xef, 0xd1, 0xbc, 0x61, 0x78); DEFINE_GUID(CLSID_ShellLinkObject, 0x11219420, 0x1768, 0x11d1, 0x95, 0xbe, 0x00, 0x60, 0x97, 0x97, 0xea, 0x4f); +DEFINE_GUID(CLSID_ShellTaskScheduler, 0x603D3800, 0xBD81, 0x11d0, 0xA3, 0xA5, 0x00, 0xC0, 0x4F, 0xD7, 0x06, 0xEC); DEFINE_GUID(CLSID_StartMenuPin, 0xa2a9545d, 0xa0c2, 0x42b4, 0x97, 0x08, 0xa0, 0xb2, 0xba, 0xdd, 0x77, 0xc8); +DEFINE_GUID(CLSID_Thumbnail, 0x7487cd30, 0xf71a, 0x11d0, 0x9e, 0xa7, 0x00, 0x80, 0x5f, 0x71, 0x47, 0x72); DEFINE_GUID(CLSID_TrackShellMenu, 0x8278F931, 0x2A3E, 0x11d2, 0x83, 0x8F, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0); +DEFINE_GUID(CLSID_UserAssist, 0xdd313e04, 0xfeff, 0x11d1, 0x8e, 0xcd, 0x00, 0x00, 0xf8, 0x7a, 0x47, 0x0c); +DEFINE_GUID(CLSID_WebSearchExt, 0x07798131, 0xaf23, 0x11d1, 0x91, 0x11, 0x00, 0xa0, 0xc9, 0x8b, 0xa6, 0x7d); DEFINE_GUID(IID_IADesktopP2, 0xb22754e2, 0x4574, 0x11d1, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9); DEFINE_GUID(IID_IAccessControl, 0xeedd23e0, 0x8410, 0x11ce, 0xa1, 0xc3, 0x08, 0x00, 0x2b, 0x2b, 0x8d, 0x8f); Modified: trunk/rostests/apitests/com/shell32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shell32.c?re… ============================================================================== --- trunk/rostests/apitests/com/shell32.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Tue Apr 12 13:18:32 2016 @@ -592,6 +592,14 @@ } }, { + ID_NAME(CLSID_Thumbnail), + { + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IParentAndItem }, + { 0x8, &IID_IObjectWithSite }, + }, + }, + { ID_NAME(CLSID_TrackShellMenu), { { 0x0, &IID_ITrackShellMenu },

1 0

[tfaber] 71149: [ADVAPI32] - Fix null termination in RegQueryInfoKeyA. Based on Wine commit 303daeef by Alexandre Juilliard.
by tfaber＠svn.reactos.org 12 Apr '16

12 Apr '16

Author: tfaber Date: Tue Apr 12 13:01:35 2016 New Revision: 71149 URL: http://svn.reactos.org/svn/reactos?rev=71149&view=rev Log: [ADVAPI32] - Fix null termination in RegQueryInfoKeyA. Based on Wine commit 303daeef by Alexandre Juilliard. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/rostests/winetests/advapi32/registry.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Tue Apr 12 13:01:35 2016 @@ -3645,7 +3645,7 @@ FALSE); ErrorCode = RtlNtStatusToDosError(Status); cClass = AnsiString.Length; - lpClass[*lpcClass - 1] = 0; + lpClass[cClass] = ANSI_NULL; } if (lpcClass != NULL) Modified: trunk/rostests/winetests/advapi32/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/regist… ============================================================================== --- trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] Tue Apr 12 13:01:35 2016 @@ -2,7 +2,7 @@ * Unit tests for registry functions * * Copyright (c) 2002 Alexandre Julliard - * Copyright (c) 2010 André Hentschel + * Copyright (c) 2010 AndrÃ© Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1997,8 +1997,30 @@ "classbuffer = \"%.*s\", expected %s\n", (int)sizeof(classbuffer), classbuffer, expectbuffer); + memset(classbuffer, 0x55, sizeof(classbuffer)); + classlen = 0xdeadbeef; + ret = RegQueryInfoKeyA(subkey, classbuffer, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == sizeof(subkey_class) - 1, "classlen = %u\n", classlen); + memset(expectbuffer, 0x55, sizeof(expectbuffer)); + strcpy(expectbuffer, subkey_class); + ok(!memcmp(classbuffer, expectbuffer, sizeof(classbuffer)), + "classbuffer = \"%.*s\", expected %s\n", + (int)sizeof(classbuffer), classbuffer, expectbuffer); + memset(classbufferW, 0x55, sizeof(classbufferW)); classlen = sizeof(subkey_class); + ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == sizeof(subkey_class) - 1, "classlen = %u\n", classlen); + memset(expectbufferW, 0x55, sizeof(expectbufferW)); + lstrcpyW(expectbufferW, subkey_classW); + ok(!memcmp(classbufferW, expectbufferW, sizeof(classbufferW)), + "classbufferW = %s, expected %s\n", + wine_dbgstr_wn(classbufferW, sizeof(classbufferW) / sizeof(WCHAR)), wine_dbgstr_w(expectbufferW)); + + memset(classbufferW, 0x55, sizeof(classbufferW)); + classlen = 0xdeadbeef; ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == sizeof(subkey_class) - 1, "classlen = %u\n", classlen);

1 0

[tfaber] 71148: [PSDK] - Add CLSID_ACLHistory, CLSID_ACLMRU, CLSID_ACLCustomMRU
by tfaber＠svn.reactos.org 12 Apr '16

12 Apr '16

Author: tfaber Date: Tue Apr 12 11:58:11 2016 New Revision: 71148 URL: http://svn.reactos.org/svn/reactos?rev=71148&view=rev Log: [PSDK] - Add CLSID_ACLHistory, CLSID_ACLMRU, CLSID_ACLCustomMRU Modified: trunk/reactos/include/psdk/shlguid.h Modified: trunk/reactos/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid.h [iso-8859-1] Tue Apr 12 11:58:11 2016 @@ -96,8 +96,11 @@ DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40, 0x915C, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(CLSID_ACLHistory, 0x00bb2764, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4F, 0xd7, 0xd0, 0x62); DEFINE_GUID(CLSID_ACLMulti, 0x00bb2765, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); -DEFINE_GUID(CLSID_ACListISF, 0x03c036f1, 0xa186, 0x11d0, 0x82, 0x4a, 0x00, 0xaa, 0x00, 0x5b, 0x043, 0x83); +DEFINE_GUID(CLSID_ACListISF, 0x03c036f1, 0xa186, 0x11d0, 0x82, 0x4a, 0x00, 0xaa, 0x00, 0x5b, 0x43, 0x83); +DEFINE_GUID(CLSID_ACLMRU, 0x6756a641, 0xde71, 0x11d0, 0x83, 0x1b, 0x00, 0xaa, 0x00, 0x5b, 0x43, 0x83); +DEFINE_GUID(CLSID_ACLCustomMRU, 0x6935db93, 0x21e8, 0x4ccc, 0xbe, 0xb9, 0x9f, 0xe3, 0xc7, 0x7a, 0x29, 0x7a); #define SID_SInternetExplorer IID_IWebBrowserApp #define SID_SWebBrowserApp IID_IWebBrowserApp

1 0

[tfaber] 71147: [PSDK] - Import SHCreateShellItemArrayFromIDLists, IShellView3, IAssocHandlerInvoker, IAssocHandler, IEnumAssocHandlers, SHAssocEnumHandlers and EnumerableObjectCollection from Wine
by tfaber＠svn.reactos.org 12 Apr '16

12 Apr '16

Author: tfaber Date: Tue Apr 12 09:27:27 2016 New Revision: 71147 URL: http://svn.reactos.org/svn/reactos?rev=71147&view=rev Log: [PSDK] - Import SHCreateShellItemArrayFromIDLists, IShellView3, IAssocHandlerInvoker, IAssocHandler, IEnumAssocHandlers, SHAssocEnumHandlers and EnumerableObjectCollection from Wine Modified: trunk/reactos/include/psdk/shobjidl.idl Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Tue Apr 12 09:27:27 2016 @@ -589,6 +589,7 @@ cpp_quote("HRESULT WINAPI SHGetItemFromObject(IUnknown *punk, REFIID riid, void **ppv);") cpp_quote("HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, IShellFolder* psf, UINT cidl, PCUITEMID_CHILD_ARRAY ppidl, IShellItemArray **ppsiItemArray);") cpp_quote("HRESULT WINAPI SHCreateShellItemArrayFromShellItem(IShellItem *psi, REFIID riid, void **ppv);") +cpp_quote("HRESULT WINAPI SHCreateShellItemArrayFromIDLists(UINT cidl, PCIDLIST_ABSOLUTE_ARRAY pidl_array, IShellItemArray **psia);") cpp_quote("HRESULT WINAPI SHCreateShellItemArrayFromDataObject(IDataObject *pdo, REFIID riid, void **ppv);") /***************************************************************************** @@ -798,6 +799,35 @@ [in] UINT flags, [in] POINT *point ); +} + +[ + object, + uuid(ec39fa88-f8af-41c5-8421-38bed28f4673), + pointer_default(unique) +] +interface IShellView3 : IShellView2 +{ + [v1_enum] enum _SV3CVW3_FLAGS + { + SV3CVW3_DEFAULT = 0x00000000, + SV3CVW3_NONINTERACTIVE = 0x00000001, + SV3CVW3_FORCEVIEWMODE = 0x00000002, + SV3CVW3_FORCEFOLDERFLAGS = 0x00000004 + }; + + typedef DWORD SV3CVW3_FLAGS; + + HRESULT CreateViewWindow3( + [in] IShellBrowser *owner, + [in, unique] IShellView *prev_view, + [in] SV3CVW3_FLAGS view_flags, + [in] FOLDERFLAGS mask, + [in] FOLDERFLAGS flags, + [in] FOLDERVIEWMODE mode, + [in, unique] const SHELLVIEWID *view_id, + [in] const RECT *rect, + [out] HWND *hwnd); } /***************************************************************************** @@ -4065,6 +4095,53 @@ [out, iid_is(riid)] void **presources); } +[ + uuid(92218cab-ecaa-4335-8133-807fd234c2ee), + object, + pointer_default(unique) +] +interface IAssocHandlerInvoker : IUnknown +{ + HRESULT SupportsSelection(); + HRESULT Invoke(); +} + +[ + uuid(f04061ac-1659-4a3f-a954-775aa57fc083), + object, + pointer_default(unique) +] +interface IAssocHandler : IUnknown +{ + HRESULT GetName([out, string] LPWSTR *name); + HRESULT GetUIName([out, string] LPWSTR *uiname); + HRESULT GetIconLocation([out, string] LPWSTR *path, + [out] int *index); + HRESULT IsRecommended(); + HRESULT MakeDefault([in, string] LPCWSTR description); + HRESULT Invoke([in] IDataObject *object); + HRESULT CreateInvoker([in] IDataObject *object, + [out] IAssocHandlerInvoker **invoker); +} + +[ + uuid(973810ae-9599-4b88-9e4d-6ee98c9552da), + object, + pointer_default(unique) +] +interface IEnumAssocHandlers : IUnknown +{ + HRESULT Next([in] ULONG count, + [out, size_is(count), length_is(*fetched)] IAssocHandler **handlers, + [out] ULONG *fetched); +} + +typedef enum ASSOC_FILTER +{ + ASSOC_FILTER_NONE = 0, + ASSOC_FILTER_RECOMMENDED +} ASSOC_FILTER; +cpp_quote("HRESULT WINAPI SHAssocEnumHandlers(PCWSTR extra, ASSOC_FILTER filter, IEnumAssocHandlers **handlersenum);") typedef [v1_enum] enum ACTIVATEOPTIONS { @@ -4173,6 +4250,14 @@ ] coclass DestinationList { interface ICustomDestinationList; + } + + [ + uuid(2d3468c1-36a7-43b6-ac24-d3f02fd9607a) + ] + coclass EnumerableObjectCollection + { + interface IEnumObjects; } [

1 0

[tfaber] 71146: [PSDK] - Reorder some definitions in shobjidl.idl to get us in better sync with Wine
by tfaber＠svn.reactos.org 12 Apr '16

12 Apr '16

Author: tfaber Date: Tue Apr 12 06:51:20 2016 New Revision: 71146 URL: http://svn.reactos.org/svn/reactos?rev=71146&view=rev Log: [PSDK] - Reorder some definitions in shobjidl.idl to get us in better sync with Wine Modified: trunk/reactos/include/psdk/shobjidl.idl Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Tue Apr 12 06:51:20 2016 @@ -1998,6 +1998,145 @@ } /***************************************************************************** + * ITaskbarList2 interface + */ +[ + object, + uuid(602D4995-B13A-429B-A66E-1935E44F4317), + pointer_default(unique) +] +interface ITaskbarList2 : ITaskbarList +{ + HRESULT MarkFullscreenWindow( + [in] HWND hwnd, + [in] BOOL fullscreen); +} + +cpp_quote("#ifdef MIDL_PASS") +typedef IUnknown* HIMAGELIST; +cpp_quote("#endif") + +typedef [v1_enum] enum THUMBBUTTONFLAGS { + THBF_ENABLED = 0x0000, + THBF_DISABLED = 0x0001, + THBF_DISMISSONCLICK = 0x0002, + THBF_NOBACKGROUND = 0x0004, + THBF_HIDDEN = 0x0008, + THBF_NONINTERACTIVE = 0x0010 +} THUMBBUTTONFLAGS; + +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(THUMBBUTTONFLAGS)") + +typedef [v1_enum] enum THUMBBUTTONMASK { + THB_BITMAP = 0x0001, + THB_ICON = 0x0002, + THB_TOOLTIP = 0x0004, + THB_FLAGS = 0x0008 +} THUMBBUTTONMASK; + +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(THUMBBUTTONMASK)") + +cpp_quote("#include <pshpack8.h>") +typedef struct THUMBBUTTON { + THUMBBUTTONMASK dwMask; + UINT iId; + UINT iBitmap; + HICON hIcon; + WCHAR szTip[260]; + THUMBBUTTONFLAGS dwFlags; +} THUMBBUTTON, *LPTHUMBBUTTON; +cpp_quote("#include <poppack.h>") + +[ + uuid(ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf), + object +] +interface ITaskbarList3 : ITaskbarList2 +{ + typedef [v1_enum] enum TBPFLAG { + TBPF_NOPROGRESS = 0x0000, + TBPF_INDETERMINATE = 0x0001, + TBPF_NORMAL = 0x0002, + TBPF_ERROR = 0x0004, + TBPF_PAUSED = 0x0008 + } TBPFLAG; + + cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(TBPFLAG)") + + HRESULT SetProgressValue( + [in] HWND hwnd, + [in] ULONGLONG ullCompleted, + [in] ULONGLONG ullTotal); + + HRESULT SetProgressState( + [in] HWND hwnd, + [in] TBPFLAG tbpFlags); + + HRESULT RegisterTab( + [in] HWND hwndTab, + [in] HWND hwndMDI); + + HRESULT UnregisterTab([in] HWND hwndTab); + + HRESULT SetTabOrder( + [in] HWND hwndTab, + [in] HWND hwndInsertBefore); + + HRESULT SetTabActive( + [in] HWND hwndTab, + [in] HWND hwndMDI, + [in] DWORD dwReserved); + + HRESULT ThumbBarAddButtons( + [in] HWND hwnd, + [in] UINT cButtons, + [in, size_is(cButtons)] LPTHUMBBUTTON pButton); + + HRESULT ThumbBarUpdateButtons( + [in] HWND hwnd, + [in] UINT cButtons, + [in, size_is(cButtons)] LPTHUMBBUTTON pButton); + + HRESULT ThumbBarSetImageList( + [in] HWND hwnd, + [in] HIMAGELIST himl); + + HRESULT SetOverlayIcon( + [in] HWND hwnd, + [in] HICON hIcon, + [in, unique, string] LPCWSTR pszDescription); + + HRESULT SetThumbnailTooltip( + [in] HWND hwnd, + [in, unique, string] LPCWSTR pszTip); + + HRESULT SetThumbnailClip( + [in] HWND hwnd, + [in] RECT *prcClip); +} + +[ + uuid(c43dc798-95d1-4bea-9030-bb99e2983a1a), + object +] +interface ITaskbarList4 : ITaskbarList3 +{ + typedef [v1_enum] enum STPFLAG { + STPF_NONE = 0x0000, + STPF_USEAPPTHUMBNAILALWAYS = 0x0001, + STPF_USEAPPTHUMBNAILWHENACTIVE = 0x0002, + STPF_USEAPPPEEKALWAYS = 0x0004, + STPF_USEAPPPEEKWHENACTIVE = 0x0008 + } STPFLAG; + + cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(STPFLAG)") + + HRESULT SetTabProperties( + [in] HWND hwndTab, + [in] STPFLAG stpFlags); +} + +/***************************************************************************** * IDefaultExtractIconInit interface */ @@ -2280,25 +2419,6 @@ HRESULT TranslateMenuMessage( [in, out] MSG* pmsg, [out] LRESULT* plRet); -} - -/***************************************************************************** - * IProfferService interface - */ -[ - uuid(cb728b20-f786-11ce-92ad-00aa00a74cd0), - object, - pointer_default(unique), - local -] -interface IProfferService : IUnknown -{ - HRESULT ProfferService( - [in] REFGUID service, - [in] IServiceProvider *pService, - [out] DWORD *pCookie); - - HRESULT RevokeService([in] DWORD cookie); } /***************************************************************************** @@ -2512,145 +2632,6 @@ cpp_quote("#endif /* _WIN32_IE_IE60 */") -cpp_quote("#ifdef MIDL_PASS") -typedef IUnknown* HIMAGELIST; -cpp_quote("#endif") - -typedef [v1_enum] enum THUMBBUTTONFLAGS { - THBF_ENABLED = 0x0000, - THBF_DISABLED = 0x0001, - THBF_DISMISSONCLICK = 0x0002, - THBF_NOBACKGROUND = 0x0004, - THBF_HIDDEN = 0x0008, - THBF_NONINTERACTIVE = 0x0010 -} THUMBBUTTONFLAGS; - -cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(THUMBBUTTONFLAGS)") - -typedef [v1_enum] enum THUMBBUTTONMASK { - THB_BITMAP = 0x0001, - THB_ICON = 0x0002, - THB_TOOLTIP = 0x0004, - THB_FLAGS = 0x0008 -} THUMBBUTTONMASK; - -cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(THUMBBUTTONMASK)") - -cpp_quote("#include <pshpack8.h>") -typedef struct THUMBBUTTON { - THUMBBUTTONMASK dwMask; - UINT iId; - UINT iBitmap; - HICON hIcon; - WCHAR szTip[260]; - THUMBBUTTONFLAGS dwFlags; -} THUMBBUTTON, *LPTHUMBBUTTON; -cpp_quote("#include <poppack.h>") - -/***************************************************************************** - * ITaskbarList2 interface - */ -[ - object, - uuid(602D4995-B13A-429B-A66E-1935E44F4317), - pointer_default(unique) -] -interface ITaskbarList2 : ITaskbarList -{ - HRESULT MarkFullscreenWindow( - [in] HWND hwnd, - [in] BOOL fullscreen); -} - -[ - uuid(ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf), - object -] -interface ITaskbarList3 : ITaskbarList2 -{ - typedef [v1_enum] enum TBPFLAG { - TBPF_NOPROGRESS = 0x0000, - TBPF_INDETERMINATE = 0x0001, - TBPF_NORMAL = 0x0002, - TBPF_ERROR = 0x0004, - TBPF_PAUSED = 0x0008 - } TBPFLAG; - - cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(TBPFLAG)") - - HRESULT SetProgressValue( - [in] HWND hwnd, - [in] ULONGLONG ullCompleted, - [in] ULONGLONG ullTotal); - - HRESULT SetProgressState( - [in] HWND hwnd, - [in] TBPFLAG tbpFlags); - - HRESULT RegisterTab( - [in] HWND hwndTab, - [in] HWND hwndMDI); - - HRESULT UnregisterTab([in] HWND hwndTab); - - HRESULT SetTabOrder( - [in] HWND hwndTab, - [in] HWND hwndInsertBefore); - - HRESULT SetTabActive( - [in] HWND hwndTab, - [in] HWND hwndMDI, - [in] DWORD dwReserved); - - HRESULT ThumbBarAddButtons( - [in] HWND hwnd, - [in] UINT cButtons, - [in, size_is(cButtons)] LPTHUMBBUTTON pButton); - - HRESULT ThumbBarUpdateButtons( - [in] HWND hwnd, - [in] UINT cButtons, - [in, size_is(cButtons)] LPTHUMBBUTTON pButton); - - HRESULT ThumbBarSetImageList( - [in] HWND hwnd, - [in] HIMAGELIST himl); - - HRESULT SetOverlayIcon( - [in] HWND hwnd, - [in] HICON hIcon, - [in, unique, string] LPCWSTR pszDescription); - - HRESULT SetThumbnailTooltip( - [in] HWND hwnd, - [in, unique, string] LPCWSTR pszTip); - - HRESULT SetThumbnailClip( - [in] HWND hwnd, - [in] RECT *prcClip); -} - -[ - uuid(c43dc798-95d1-4bea-9030-bb99e2983a1a), - object -] -interface ITaskbarList4 : ITaskbarList3 -{ - typedef [v1_enum] enum STPFLAG { - STPF_NONE = 0x0000, - STPF_USEAPPTHUMBNAILALWAYS = 0x0001, - STPF_USEAPPTHUMBNAILWHENACTIVE = 0x0002, - STPF_USEAPPPEEKALWAYS = 0x0004, - STPF_USEAPPPEEKWHENACTIVE = 0x0008 - } STPFLAG; - - cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(STPFLAG)") - - HRESULT SetTabProperties( - [in] HWND hwndTab, - [in] STPFLAG stpFlags); -} - /***************************************************************************** * IAutoCompleteDropDown interface */ @@ -2668,6 +2649,24 @@ [out, string] LPWSTR *ppwszString); HRESULT ResetEnumerator(); +} + +/***************************************************************************** + * IProfferService interface + */ +[ + object, + uuid(cb728b20-f786-11ce-92ad-00aa00a74cd0), + pointer_default(unique) +] +interface IProfferService : IUnknown +{ + HRESULT ProfferService( + [in] REFGUID service, + [in] IServiceProvider *pService, + [out] DWORD *pCookie); + + HRESULT RevokeService([in] DWORD cookie); } /*****************************************************************************

1 0

[pschweitzer] 71145: [NTOSKRNL] In FsRtlAddBaseMcbEntry(), try to detect incompatible LBNs before altering mappings. This fixes a few tests failures CORE-11002
by pschweitzer＠svn.reactos.org 11 Apr '16

11 Apr '16

Author: pschweitzer Date: Mon Apr 11 20:29:35 2016 New Revision: 71145 URL: http://svn.reactos.org/svn/reactos?rev=71145&view=rev Log: [NTOSKRNL] In FsRtlAddBaseMcbEntry(), try to detect incompatible LBNs before altering mappings. This fixes a few tests failures CORE-11002 Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/largemcb.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Mon Apr 11 20:29:35 2016 @@ -135,10 +135,12 @@ IN LONGLONG SectorCount) { BOOLEAN Result = TRUE; + BOOLEAN IntResult; PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; LARGE_MCB_MAPPING_ENTRY Node, NeedleRun; PLARGE_MCB_MAPPING_ENTRY LowerRun, HigherRun; BOOLEAN NewElement; + LONGLONG IntLbn; DPRINT("FsRtlAddBaseMcbEntry(%p, %I64d, %I64d, %I64d)\n", OpaqueMcb, Vbn, Lbn, SectorCount); @@ -152,6 +154,16 @@ { Result = FALSE; goto quit; + } + + IntResult = FsRtlLookupBaseMcbEntry(OpaqueMcb, Vbn, &IntLbn, NULL, NULL, NULL, NULL); + if (IntResult) + { + if (IntLbn != -1 && IntLbn != Lbn) + { + Result = FALSE; + goto quit; + } } /* clean any possible previous entries in our range */

1 0

[mjansen] 71144: [SHELL32][SHELL32_WINETEST] Connect CDefViewDual to CDefView to fix crashes in the shelldispatch test ROSTESTS-209 - CDefViewDual::get_Application now returns a new CDefView to fix...
by mjansen＠svn.reactos.org 11 Apr '16

11 Apr '16

Author: mjansen Date: Mon Apr 11 18:28:31 2016 New Revision: 71144 URL: http://svn.reactos.org/svn/reactos?rev=71144&view=rev Log: [SHELL32][SHELL32_WINETEST] Connect CDefViewDual to CDefView to fix crashes in the shelldispatch test ROSTESTS-209 - CDefViewDual::get_Application now returns a new CDefView to fix the winetest. - Update CFolder, CFolderItem(s), CFolderItemVerb(s), CShell to use the new IDispatchImpl - Enable the last two skipped testcases (test_ShellFolderViewDual, test_ShellWindows) Modified: trunk/reactos/dll/win32/shell32/CDefViewDual.cpp trunk/reactos/dll/win32/shell32/CFolder.cpp trunk/reactos/dll/win32/shell32/CFolder.h trunk/reactos/dll/win32/shell32/CFolderItemVerbs.cpp trunk/reactos/dll/win32/shell32/CFolderItemVerbs.h trunk/reactos/dll/win32/shell32/CFolderItems.cpp trunk/reactos/dll/win32/shell32/CFolderItems.h trunk/reactos/dll/win32/shell32/CShell.cpp trunk/reactos/dll/win32/shell32/CShell.h trunk/reactos/dll/win32/shell32/wine/shell32_main.h trunk/rostests/winetests/shell32/shelldispatch.c Modified: trunk/reactos/dll/win32/shell32/CDefViewDual.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefViewDual.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefViewDual.cpp [iso-8859-1] Mon Apr 11 18:28:31 2016 @@ -46,9 +46,8 @@ virtual HRESULT STDMETHODCALLTYPE get_Application(IDispatch **app) override { if (!app) return E_INVALIDARG; - *app = NULL; - FIXME("CDefViewDual::get_Application is UNIMPLEMENTED (%p, %p)\n", this, app); - return E_NOTIMPL; + + return CShell_Constructor(IID_IDispatch, (LPVOID*)app); } virtual HRESULT STDMETHODCALLTYPE get_Parent(IDispatch **parent) override Modified: trunk/reactos/dll/win32/shell32/CFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CFolder.… ============================================================================== --- trunk/reactos/dll/win32/shell32/CFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CFolder.cpp [iso-8859-1] Mon Apr 11 18:28:31 2016 @@ -36,38 +36,30 @@ m_idlist.Attach(idlist); } -// *** IDispatch methods *** -HRESULT STDMETHODCALLTYPE CFolder::GetTypeInfoCount(UINT *pctinfo) +HRESULT CFolder::GetShellFolder(CComPtr<IShellFolder>& psfCurrent) { - TRACE("(%p, %p)\n", this, pctinfo); - return E_NOTIMPL; + CComPtr<IShellFolder> psfDesktop; + + HRESULT hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return psfDesktop->BindToObject(m_idlist, NULL, IID_PPV_ARG(IShellFolder, &psfCurrent)); } - -HRESULT STDMETHODCALLTYPE CFolder::GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - TRACE("(%p, %lu, %lu, %p)\n", this, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CFolder::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - TRACE("(%p, %s, %p, %lu, %lu, %p)\n", this, wine_dbgstr_guid(&riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CFolder::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - TRACE("(%p, %lu, %s, %lu, %lu, %p, %p, %p, %p)\n", this, dispIdMember, wine_dbgstr_guid(&riid), lcid, (DWORD)wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; -} - // *** Folder methods *** HRESULT STDMETHODCALLTYPE CFolder::get_Title(BSTR *pbs) { - TRACE("(%p, %p)\n", this, pbs); - return E_NOTIMPL; + if (!pbs) + return E_POINTER; + + WCHAR path[MAX_PATH+2] = {0}; + HRESULT hr = ILGetDisplayNameExW(NULL, m_idlist, path, ILGDN_INFOLDER); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + *pbs = SysAllocString(path); + return S_OK; } HRESULT STDMETHODCALLTYPE CFolder::get_Application(IDispatch **ppid) @@ -97,15 +89,12 @@ HRESULT STDMETHODCALLTYPE CFolder::ParseName(BSTR bName, FolderItem **ppid) { TRACE("(%p, %s, %p)\n", this, wine_dbgstr_w(bName), ppid); - - CComPtr<IShellFolder> psfDesktop; - - HRESULT hr = SHGetDesktopFolder(&psfDesktop); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + if (!ppid) + return E_POINTER; + *ppid = NULL; CComPtr<IShellFolder> psfCurrent; - hr = psfDesktop->BindToObject(m_idlist, NULL, IID_PPV_ARG(IShellFolder, &psfCurrent)); + HRESULT hr = GetShellFolder(psfCurrent); if (FAILED_UNEXPECTEDLY(hr)) return hr; Modified: trunk/reactos/dll/win32/shell32/CFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CFolder.… ============================================================================== --- trunk/reactos/dll/win32/shell32/CFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CFolder.h [iso-8859-1] Mon Apr 11 18:28:31 2016 @@ -25,9 +25,11 @@ class CFolder: public CComCoClass<CFolder>, public CComObjectRootEx<CComMultiThreadModelNoCS>, - public Folder2 + public IDispatchImpl<Folder2, &IID_Folder2> { private: + HRESULT GetShellFolder(CComPtr<IShellFolder>& psfCurrent); + CComHeapPtr<ITEMIDLIST> m_idlist; public: @@ -35,13 +37,6 @@ ~CFolder(); void Init(LPITEMIDLIST idlist); - - // *** IDispatch methods *** - virtual HRESULT STDMETHODCALLTYPE GetTypeInfoCount(UINT *pctinfo); - virtual HRESULT STDMETHODCALLTYPE GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); - virtual HRESULT STDMETHODCALLTYPE GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId); - virtual HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr); - // *** Folder methods *** virtual HRESULT STDMETHODCALLTYPE get_Title(BSTR *pbs); Modified: trunk/reactos/dll/win32/shell32/CFolderItemVerbs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CFolderI… ============================================================================== --- trunk/reactos/dll/win32/shell32/CFolderItemVerbs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CFolderItemVerbs.cpp [iso-8859-1] Mon Apr 11 18:28:31 2016 @@ -31,35 +31,10 @@ { } -//void CFolderItemVerb::Init(LPITEMIDLIST idlist) -//{ -// m_idlist.Attach(idlist); -//} - -// *** IDispatch methods *** -HRESULT STDMETHODCALLTYPE CFolderItemVerb::GetTypeInfoCount(UINT *pctinfo) +void CFolderItemVerb::Init(IContextMenu* menu, BSTR name) { - TRACE("(%p, %p)\n", this, pctinfo); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CFolderItemVerb::GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - TRACE("(%p, %lu, %lu, %p)\n", this, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CFolderItemVerb::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - TRACE("(%p, %s, %p, %lu, %lu, %p)\n", this, wine_dbgstr_guid(&riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CFolderItemVerb::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - TRACE("(%p, %lu, %s, %lu, %lu, %p, %p, %p, %p)\n", this, dispIdMember, wine_dbgstr_guid(&riid), lcid, (DWORD)wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + m_contextmenu = menu; + m_name.m_str = name; } // *** FolderItemVerb methods *** @@ -78,12 +53,10 @@ HRESULT STDMETHODCALLTYPE CFolderItemVerb::get_Name(BSTR *pbs) { - TRACE("(%p, %p)\n", this, pbs); if (!pbs) return E_POINTER; - // Terminating item: - *pbs = SysAllocString(L""); - return E_NOTIMPL; + *pbs = SysAllocString(m_name); + return S_OK; } HRESULT STDMETHODCALLTYPE CFolderItemVerb::DoIt() @@ -98,52 +71,45 @@ CFolderItemVerbs::CFolderItemVerbs() + :m_menu(NULL) + ,m_count(0) { } CFolderItemVerbs::~CFolderItemVerbs() { + DestroyMenu(m_menu); } -//void CFolderItemVerbs::Init(LPITEMIDLIST idlist) -//{ -// m_idlist.Attach(idlist); -//} +HRESULT CFolderItemVerbs::Init(LPITEMIDLIST idlist) +{ + CComPtr<IShellFolder> folder; + LPCITEMIDLIST child; + HRESULT hr = SHBindToParent(idlist, IID_PPV_ARG(IShellFolder, &folder), &child); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; -// *** IDispatch methods *** -HRESULT STDMETHODCALLTYPE CFolderItemVerbs::GetTypeInfoCount(UINT *pctinfo) -{ - TRACE("(%p, %p)\n", this, pctinfo); - return E_NOTIMPL; + hr = folder->GetUIObjectOf(NULL, 1, &child, IID_IContextMenu, NULL, (PVOID*)&m_contextmenu); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + m_menu = CreatePopupMenu(); + hr = m_contextmenu->QueryContextMenu(m_menu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); + if (!SUCCEEDED(hr)) + return hr; + + m_count = GetMenuItemCount(m_menu); + return hr; } -HRESULT STDMETHODCALLTYPE CFolderItemVerbs::GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - TRACE("(%p, %lu, %lu, %p)\n", this, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CFolderItemVerbs::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - TRACE("(%p, %s, %p, %lu, %lu, %p)\n", this, wine_dbgstr_guid(&riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CFolderItemVerbs::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - TRACE("(%p, %lu, %s, %lu, %lu, %p, %p, %p, %p)\n", this, dispIdMember, wine_dbgstr_guid(&riid), lcid, (DWORD)wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; -} // *** FolderItemVerbs methods *** HRESULT STDMETHODCALLTYPE CFolderItemVerbs::get_Count(LONG *plCount) { - TRACE("(%p, %p)\n", this, plCount); if (!plCount) return E_POINTER; - *plCount = 0; - return E_NOTIMPL; + *plCount = m_count; + return S_OK; } HRESULT STDMETHODCALLTYPE CFolderItemVerbs::get_Application(IDispatch **ppid) @@ -158,18 +124,51 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CFolderItemVerbs::Item(VARIANT index, FolderItemVerb **ppid) +HRESULT STDMETHODCALLTYPE CFolderItemVerbs::Item(VARIANT indexVar, FolderItemVerb **ppid) { - TRACE("(%p, %s, %p)\n", this, wine_dbgstr_variant(&index), ppid); if (!ppid) return E_POINTER; - /* FIXME! */ + CComVariant var; + VariantCopyInd(&var, &indexVar); + + HRESULT hr = VariantChangeType(&var, &var, 0, VT_I4); + if (FAILED_UNEXPECTEDLY(hr)) + return E_INVALIDARG; + + int index = V_I4(&var); + + if (index > m_count) + return S_OK; + + BSTR name = NULL; + + if(index == m_count) + name = SysAllocStringLen(NULL, 0); + else + { + MENUITEMINFOW info = { sizeof(info), 0 }; + info.fMask = MIIM_STRING; + if (!GetMenuItemInfoW(m_menu, index, TRUE, &info)) + return E_FAIL; + name = SysAllocStringLen(NULL, info.cch); + if (name) + { + info.dwTypeData = name; + info.cch++; + GetMenuItemInfoW(m_menu, index, TRUE, &info); + } + } + + if (!name) + return E_OUTOFMEMORY; + CFolderItemVerb* verb = new CComObject<CFolderItemVerb>(); + verb->Init(m_contextmenu, name); verb->AddRef(); *ppid = verb; - return E_NOTIMPL; + return S_OK; } HRESULT STDMETHODCALLTYPE CFolderItemVerbs::_NewEnum(IUnknown **ppunk) Modified: trunk/reactos/dll/win32/shell32/CFolderItemVerbs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CFolderI… ============================================================================== --- trunk/reactos/dll/win32/shell32/CFolderItemVerbs.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CFolderItemVerbs.h [iso-8859-1] Mon Apr 11 18:28:31 2016 @@ -24,22 +24,17 @@ class CFolderItemVerb: public CComCoClass<CFolderItemVerb>, public CComObjectRootEx<CComMultiThreadModelNoCS>, - public FolderItemVerb + public IDispatchImpl<FolderItemVerb, &IID_FolderItemVerb> { private: + CComPtr<IContextMenu> m_contextmenu; + CComBSTR m_name; public: CFolderItemVerb(); ~CFolderItemVerb(); - //void Init(LPITEMIDLIST idlist); - - - // *** IDispatch methods *** - virtual HRESULT STDMETHODCALLTYPE GetTypeInfoCount(UINT *pctinfo); - virtual HRESULT STDMETHODCALLTYPE GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); - virtual HRESULT STDMETHODCALLTYPE GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId); - virtual HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr); + void Init(IContextMenu* menu, BSTR name); // *** FolderItemVerb methods *** virtual HRESULT STDMETHODCALLTYPE get_Application(IDispatch **ppid); @@ -61,22 +56,18 @@ class CFolderItemVerbs: public CComCoClass<CFolderItemVerbs>, public CComObjectRootEx<CComMultiThreadModelNoCS>, - public FolderItemVerbs + public IDispatchImpl<FolderItemVerbs, &IID_FolderItemVerbs> { private: + CComPtr<IContextMenu> m_contextmenu; + HMENU m_menu; + int m_count; public: CFolderItemVerbs(); - ~CFolderItemVerbs(); + virtual ~CFolderItemVerbs(); - //void Init(LPITEMIDLIST idlist); - - - // *** IDispatch methods *** - virtual HRESULT STDMETHODCALLTYPE GetTypeInfoCount(UINT *pctinfo); - virtual HRESULT STDMETHODCALLTYPE GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); - virtual HRESULT STDMETHODCALLTYPE GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId); - virtual HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr); + HRESULT Init(LPITEMIDLIST idlist); // *** FolderItemVerbs methods *** virtual HRESULT STDMETHODCALLTYPE get_Count(LONG *plCount); Modified: trunk/reactos/dll/win32/shell32/CFolderItems.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CFolderI… ============================================================================== --- trunk/reactos/dll/win32/shell32/CFolderItems.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CFolderItems.cpp [iso-8859-1] Mon Apr 11 18:28:31 2016 @@ -36,32 +36,6 @@ m_idlist.Attach(idlist); } -// *** IDispatch methods *** -HRESULT STDMETHODCALLTYPE CFolderItem::GetTypeInfoCount(UINT *pctinfo) -{ - TRACE("(%p, %p)\n", this, pctinfo); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CFolderItem::GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - TRACE("(%p, %lu, %lu, %p)\n", this, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CFolderItem::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - TRACE("(%p, %s, %p, %lu, %lu, %p)\n", this, wine_dbgstr_guid(&riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CFolderItem::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - TRACE("(%p, %lu, %s, %lu, %lu, %p, %p, %p, %p)\n", this, dispIdMember, wine_dbgstr_guid(&riid), lcid, (DWORD)wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; -} - // *** FolderItem methods *** HRESULT STDMETHODCALLTYPE CFolderItem::get_Application(IDispatch **ppid) { @@ -165,9 +139,15 @@ HRESULT STDMETHODCALLTYPE CFolderItem::Verbs(FolderItemVerbs **ppfic) { - if(!ppfic) + if (!ppfic) return E_POINTER; CFolderItemVerbs* verbs = new CComObject<CFolderItemVerbs>(); + HRESULT hr = verbs->Init(m_idlist); + if (FAILED_UNEXPECTEDLY(hr)) + { + delete verbs; + return hr; + } verbs->AddRef(); *ppfic = verbs; return S_OK; @@ -181,40 +161,12 @@ - - CFolderItems::CFolderItems() { } CFolderItems::~CFolderItems() { -} - -// *** IDispatch methods *** -HRESULT STDMETHODCALLTYPE CFolderItems::GetTypeInfoCount(UINT *pctinfo) -{ - TRACE("(%p, %p)\n", this, pctinfo); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CFolderItems::GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - TRACE("(%p, %lu, %lu, %p)\n", this, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CFolderItems::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - TRACE("(%p, %s, %p, %lu, %lu, %p)\n", this, wine_dbgstr_guid(&riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CFolderItems::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - TRACE("(%p, %lu, %s, %lu, %lu, %p, %p, %p, %p)\n", this, dispIdMember, wine_dbgstr_guid(&riid), lcid, (DWORD)wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; } // *** FolderItems methods *** Modified: trunk/reactos/dll/win32/shell32/CFolderItems.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CFolderI… ============================================================================== --- trunk/reactos/dll/win32/shell32/CFolderItems.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CFolderItems.h [iso-8859-1] Mon Apr 11 18:28:31 2016 @@ -25,7 +25,7 @@ class CFolderItem: public CComCoClass<CFolderItem>, public CComObjectRootEx<CComMultiThreadModelNoCS>, - public FolderItem + public IDispatchImpl<FolderItem, &IID_FolderItem> { private: CComHeapPtr<ITEMIDLIST> m_idlist; @@ -36,12 +36,6 @@ void Init(LPITEMIDLIST idlist); - - // *** IDispatch methods *** - virtual HRESULT STDMETHODCALLTYPE GetTypeInfoCount(UINT *pctinfo); - virtual HRESULT STDMETHODCALLTYPE GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); - virtual HRESULT STDMETHODCALLTYPE GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId); - virtual HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr); // *** FolderItem methods *** virtual HRESULT STDMETHODCALLTYPE get_Application(IDispatch **ppid); @@ -75,19 +69,13 @@ class CFolderItems: public CComCoClass<CFolderItems>, public CComObjectRootEx<CComMultiThreadModelNoCS>, - public FolderItems + public IDispatchImpl<FolderItems, &IID_FolderItems> { private: public: CFolderItems(); ~CFolderItems(); - - // *** IDispatch methods *** - virtual HRESULT STDMETHODCALLTYPE GetTypeInfoCount(UINT *pctinfo); - virtual HRESULT STDMETHODCALLTYPE GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); - virtual HRESULT STDMETHODCALLTYPE GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId); - virtual HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr); // *** FolderItems methods *** virtual HRESULT STDMETHODCALLTYPE get_Count(long *plCount); Modified: trunk/reactos/dll/win32/shell32/CShell.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CShell.c… ============================================================================== --- trunk/reactos/dll/win32/shell32/CShell.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CShell.cpp [iso-8859-1] Mon Apr 11 18:28:31 2016 @@ -31,33 +31,10 @@ { } - -// *** IDispatch methods *** -HRESULT STDMETHODCALLTYPE CShell::GetTypeInfoCount(UINT *pctinfo) -{ - TRACE("(%p, %p)\n", this, pctinfo); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - TRACE("(%p, %lu, %lu, %p)\n", this, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - TRACE("(%p, %s, %p, %lu, %lu, %p)\n", this, wine_dbgstr_guid(&riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - TRACE("(%p, %lu, %s, %lu, %lu, %p, %p, %p, %p)\n", this, dispIdMember, wine_dbgstr_guid(&riid), lcid, (DWORD)wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; -} - +HRESULT CShell::Initialize() +{ + return S_OK; +} // *** IShellDispatch methods *** HRESULT STDMETHODCALLTYPE CShell::get_Application(IDispatch **ppid) @@ -341,4 +318,8 @@ return E_NOTIMPL; } - +HRESULT WINAPI CShell_Constructor(REFIID riid, LPVOID * ppvOut) +{ + return ShellObjectCreatorInit<CShell>(riid, ppvOut); +} + Modified: trunk/reactos/dll/win32/shell32/CShell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CShell.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/CShell.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CShell.h [iso-8859-1] Mon Apr 11 18:28:31 2016 @@ -26,7 +26,7 @@ class CShell: public CComCoClass<CShell, &CLSID_Shell>, public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IShellDispatch4, + public IDispatchImpl<IShellDispatch4, &IID_IShellDispatch4>, public IObjectSafety, public IObjectWithSite { @@ -36,11 +36,7 @@ CShell(); ~CShell(); - // *** IDispatch methods *** - virtual HRESULT STDMETHODCALLTYPE GetTypeInfoCount(UINT *pctinfo); - virtual HRESULT STDMETHODCALLTYPE GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); - virtual HRESULT STDMETHODCALLTYPE GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId); - virtual HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr); + HRESULT Initialize(); // *** IShellDispatch methods *** virtual HRESULT STDMETHODCALLTYPE get_Application(IDispatch **ppid); Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] Mon Apr 11 18:28:31 2016 @@ -72,6 +72,7 @@ HRESULT WINAPI IShellView_Constructor(IShellFolder *pFolder, IShellView **newView); HRESULT WINAPI CDefView_Constructor(IShellFolder *pFolder, REFIID riid, LPVOID * ppvOut); HRESULT WINAPI CDefViewDual_Constructor(REFIID riid, LPVOID * ppvOut); +HRESULT WINAPI CShell_Constructor(REFIID riid, LPVOID * ppvOut); HRESULT WINAPI IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, LPVOID * ppv); HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV); Modified: trunk/rostests/winetests/shell32/shelldispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shelldi… ============================================================================== --- trunk/rostests/winetests/shell32/shelldispatch.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shelldispatch.c [iso-8859-1] Mon Apr 11 18:28:31 2016 @@ -880,17 +880,8 @@ init_function_pointers(); test_namespace(); test_service(); -#ifdef __REACTOS__ - if (!winetest_interactive) - skip("ROSTESTS-209: Skipping test_ShellFolderViewDual() and test_ShellWindows().\n"); - else - { -#endif test_ShellFolderViewDual(); test_ShellWindows(); -#ifdef __REACTOS__ - } -#endif test_ParseName(); test_Verbs();

1 0

[cfinck] 71143: [DOXYGEN] doxygen.reactos.org is back, with a revamped Doxyfile and a new design! (= the standard Doxygen design :P) This is mostly the default Doxyfile, with just obvious settings ...
by cfinck＠svn.reactos.org 11 Apr '16

11 Apr '16

Author: cfinck Date: Mon Apr 11 05:43:46 2016 New Revision: 71143 URL: http://svn.reactos.org/svn/reactos?rev=71143&view=rev Log: [DOXYGEN] doxygen.reactos.org is back, with a revamped Doxyfile and a new design! (= the standard Doxygen design :P) This is mostly the default Doxyfile, with just obvious settings imported from our old one. I've also enabled some advanced features such as dependency graphs and the treeview. The configuration is far away from perfect, but everybody is invited to tune it and see the results on the next day. Doxygen is regenerated everyday at 4:00 UTC. RosApps and RosTests are also included now. You're also invited to add Doxygen comments everywhere. Right now, the documentation is dominated by our third-party imports. Modified: trunk/reactos/Doxyfile [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Doxyfile?rev=71143&r1=7114…

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