Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 59447: [CONDRV] Initial commit of the ReactOS Console Driver. For the moment, it's just able to load/unload, creating a "controller" device and being able to DPRINT1 lots of messages whe...
by hbelusca＠svn.reactos.org 07 Jul '13

07 Jul '13

Author: hbelusca Date: Sun Jul 7 15:15:10 2013 New Revision: 59447 URL: http://svn.reactos.org/svn/reactos?rev=59447&view=rev Log: [CONDRV] Initial commit of the ReactOS Console Driver. For the moment, it's just able to load/unload, creating a "controller" device and being able to DPRINT1 lots of messages when you try to access to it. Added: trunk/reactos/drivers/base/condrv/ (with props) trunk/reactos/drivers/base/condrv/CMakeLists.txt (with props) trunk/reactos/drivers/base/condrv/condrv.c (with props) trunk/reactos/drivers/base/condrv/condrv.h (with props) trunk/reactos/drivers/base/condrv/condrv.rc (with props) trunk/reactos/drivers/base/condrv/control.c (with props) trunk/reactos/include/reactos/drivers/condrv/ (with props) trunk/reactos/include/reactos/drivers/condrv/ntddcon.h (with props) Modified: trunk/reactos/drivers/base/CMakeLists.txt Modified: trunk/reactos/drivers/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/CMakeLists.tx… ============================================================================== --- trunk/reactos/drivers/base/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/CMakeLists.txt [iso-8859-1] Sun Jul 7 15:15:10 2013 @@ -1,6 +1,7 @@ add_subdirectory(beep) add_subdirectory(bootvid) +add_subdirectory(condrv) if(_WINKD_) add_subdirectory(kdcom) Propchange: trunk/reactos/drivers/base/condrv/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Jul 7 15:15:10 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/drivers/base/condrv/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/drivers/base/condrv/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/drivers/base/condrv/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/drivers/base/condrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/condrv/CMakeL… ============================================================================== --- trunk/reactos/drivers/base/condrv/CMakeLists.txt (added) +++ trunk/reactos/drivers/base/condrv/CMakeLists.txt [iso-8859-1] Sun Jul 7 15:15:10 2013 @@ -0,0 +1,18 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) + +## spec2def(condrv.sys condrv.spec ADD_IMPORTLIB) + +add_library(condrv SHARED + condrv.c + control.c + condrv.rc) + # ${CMAKE_CURRENT_BINARY_DIR}/condrv.def) + +add_pch(condrv condrv.h) + +set_module_type(condrv kernelmodedriver) +target_link_libraries(condrv ${PSEH_LIB}) +add_importlibs(condrv ntoskrnl hal) + +add_cd_file(TARGET condrv DESTINATION reactos/system32/drivers NO_CAB FOR all) Propchange: trunk/reactos/drivers/base/condrv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/base/condrv/condrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/condrv/condrv… ============================================================================== --- trunk/reactos/drivers/base/condrv/condrv.c (added) +++ trunk/reactos/drivers/base/condrv/condrv.c [iso-8859-1] Sun Jul 7 15:15:10 2013 @@ -0,0 +1,172 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Driver + * FILE: drivers/base/condrv/condrv.c + * PURPOSE: Console Driver Management Functions + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#include "condrv.h" + +#define NDEBUG +#include <debug.h> + + +/* FUNCTIONS ******************************************************************/ + +/* + * Callback functions prototypes + */ +DRIVER_INITIALIZE DriverEntry; +DRIVER_UNLOAD ConDrvUnload; +/* +DRIVER_DISPATCH ConDrvIoControl; +DRIVER_DISPATCH ConDrvCreate; +DRIVER_DISPATCH ConDrvClose; +DRIVER_DISPATCH ConDrvRead; +DRIVER_DISPATCH ConDrvWrite; +DRIVER_DISPATCH ConDrvCleanup; +*/ +DRIVER_DISPATCH ConDrvDispatch; + +NTSTATUS NTAPI +CompleteRequest(IN PIRP Irp, + IN NTSTATUS Status, + IN ULONG_PTR Information) +{ + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = Information; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Irp->IoStatus.Status; +} + +NTSTATUS NTAPI +ConDrvDispatch(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +{ +#define HANDLE_CTRL_CODE(CtrlCode) \ + case CtrlCode : \ + { \ + DPRINT1("ConDrv: " #CtrlCode ", stack->FileObject = 0x%p\n", stack->FileObject); \ + if (stack->FileObject) \ + { \ + DPRINT1("stack->FileObject->FileName = %wZ\n", &stack->FileObject->FileName); \ + } \ + break; \ + } + + PIO_STACK_LOCATION stack = IoGetCurrentIrpStackLocation(Irp); + ULONG ctrlCode = stack->Parameters.DeviceIoControl.IoControlCode; + + /* Just display all the IRP codes for now... */ + switch (ctrlCode) + { + HANDLE_CTRL_CODE(IRP_MJ_CREATE); + HANDLE_CTRL_CODE(IRP_MJ_CREATE_NAMED_PIPE); + HANDLE_CTRL_CODE(IRP_MJ_CLOSE); + HANDLE_CTRL_CODE(IRP_MJ_READ); + HANDLE_CTRL_CODE(IRP_MJ_WRITE); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_INFORMATION); + HANDLE_CTRL_CODE(IRP_MJ_SET_INFORMATION); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_EA); + HANDLE_CTRL_CODE(IRP_MJ_SET_EA); + HANDLE_CTRL_CODE(IRP_MJ_FLUSH_BUFFERS); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_VOLUME_INFORMATION); + HANDLE_CTRL_CODE(IRP_MJ_SET_VOLUME_INFORMATION); + HANDLE_CTRL_CODE(IRP_MJ_DIRECTORY_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_FILE_SYSTEM_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_DEVICE_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_INTERNAL_DEVICE_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_SHUTDOWN); + HANDLE_CTRL_CODE(IRP_MJ_LOCK_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_CLEANUP); + HANDLE_CTRL_CODE(IRP_MJ_CREATE_MAILSLOT); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_SECURITY); + HANDLE_CTRL_CODE(IRP_MJ_SET_SECURITY); + HANDLE_CTRL_CODE(IRP_MJ_POWER); + HANDLE_CTRL_CODE(IRP_MJ_SYSTEM_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_DEVICE_CHANGE); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_QUOTA); + HANDLE_CTRL_CODE(IRP_MJ_SET_QUOTA); + HANDLE_CTRL_CODE(IRP_MJ_PNP); + // case IRP_MJ_PNP_POWER: + // case IRP_MJ_MAXIMUM_FUNCTION: + + default: + { + DPRINT1("Unknown code %lu\n", ctrlCode); + break; + } + } + + return CompleteRequest(Irp, STATUS_SUCCESS, 0); +} + +NTSTATUS NTAPI +DriverEntry(IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + NTSTATUS Status; + USHORT i; + PCONDRV_DRIVER DriverExtension = NULL; + + DPRINT1("Loading ReactOS Console Driver v0.0.1...\n"); + + DriverObject->DriverUnload = ConDrvUnload; + + /* Initialize the different callback function pointers */ + for (i = 0 ; i <= IRP_MJ_MAXIMUM_FUNCTION ; ++i) + DriverObject->MajorFunction[i] = ConDrvDispatch; + +#if 0 + DriverObject->MajorFunction[IRP_MJ_CREATE] = ConDrvCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = ConDrvClose; + + /* temporary deactivated... + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = ConDrvCleanup; + */ + DriverObject->MajorFunction[IRP_MJ_READ] = ConDrvRead; + DriverObject->MajorFunction[IRP_MJ_WRITE] = ConDrvWrite; + + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ConDrvIoControl; +#endif + + Status = IoAllocateDriverObjectExtension(DriverObject, + DriverObject, // Unique ID for the driver object extension ==> gives it its address ! + sizeof(CONDRV_DRIVER), + (PVOID*)&DriverExtension); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoAllocateDriverObjectExtension() failed with status 0x%08lx\n", Status); + return Status; + } + RtlZeroMemory(DriverExtension, sizeof(CONDRV_DRIVER)); + + Status = ConDrvCreateController(DriverObject, RegistryPath); + + DPRINT1("Done, Status = 0x%08lx\n", Status); + return Status; +} + +VOID NTAPI +ConDrvUnload(IN PDRIVER_OBJECT DriverObject) +{ + DPRINT1("Unloading ReactOS Console Driver v0.0.1...\n"); + + /* + * Delete the Controller device. This has as effect + * to delete also all the terminals. + */ + ConDrvDeleteController(DriverObject); + + /* Sanity check: No devices must exist at this point */ + ASSERT(DriverObject->DeviceObject == NULL); + + DPRINT1("Done\n"); + return; +} + + +/* EOF */ Propchange: trunk/reactos/drivers/base/condrv/condrv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/base/condrv/condrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/condrv/condrv… ============================================================================== --- trunk/reactos/drivers/base/condrv/condrv.h (added) +++ trunk/reactos/drivers/base/condrv/condrv.h [iso-8859-1] Sun Jul 7 15:15:10 2013 @@ -0,0 +1,47 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Driver + * FILE: drivers/base/condrv/condrv.h + * PURPOSE: Console Driver Management Functions + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#ifndef __CONDRV_H__ +#define __CONDRV_H__ + +/* This is needed for VisualDDK testing */ +#ifdef __USE_VISUALDDK_AT_HOME__ + #include "VisualDDKHelpers.h" +#endif + + +#include <ntddk.h> +#include <condrv/ntddcon.h> + + +#define CONDRV_TAG ' noC' +#define DD_CONDRV_TAG '1noC' +#define CONDRV_CONS_TAG '2noC' + + +// +// Console Driver object extension +// +typedef struct _CONDRV_DRIVER +{ + UNICODE_STRING RegistryPath; + PDEVICE_OBJECT Controller; // The unique Controller device for the driver. +} CONDRV_DRIVER, *PCONDRV_DRIVER; + + + +NTSTATUS NTAPI +ConDrvCreateController(IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath); +NTSTATUS NTAPI +ConDrvDeleteController(IN PDRIVER_OBJECT DriverObject); + + +#endif // __CONDRV_H__ + +/* EOF */ Propchange: trunk/reactos/drivers/base/condrv/condrv.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/base/condrv/condrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/condrv/condrv… ============================================================================== --- trunk/reactos/drivers/base/condrv/condrv.rc (added) +++ trunk/reactos/drivers/base/condrv/condrv.rc [iso-8859-1] Sun Jul 7 15:15:10 2013 @@ -0,0 +1,6 @@ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Console Device Driver" +#define REACTOS_STR_INTERNAL_NAME "condrv" +#define REACTOS_STR_ORIGINAL_FILENAME "condrv.sys" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/base/condrv/condrv.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/base/condrv/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/condrv/contro… ============================================================================== --- trunk/reactos/drivers/base/condrv/control.c (added) +++ trunk/reactos/drivers/base/condrv/control.c [iso-8859-1] Sun Jul 7 15:15:10 2013 @@ -0,0 +1,88 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Driver + * FILE: drivers/base/condrv/control.c + * PURPOSE: Console Driver - Controller Device + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#include "condrv.h" + +#define NDEBUG +#include <debug.h> + + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS NTAPI +ConDrvCreateController(IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING DeviceName, SymlinkName; + PCONDRV_DRIVER DriverExtension; + PDEVICE_OBJECT Controller = NULL; + + DPRINT1("Create the Controller device...\n"); + + RtlInitUnicodeString(&DeviceName , DD_CONDRV_CTRL_DEVICE_NAME_U); + RtlInitUnicodeString(&SymlinkName, DD_CONDRV_CTRL_SYMLNK_NAME_U); + + /* Get the driver extension */ + DriverExtension = (PCONDRV_DRIVER)IoGetDriverObjectExtension(DriverObject, + DriverObject); + + /* Create the Controller device, if it doesn't exist */ + Status = IoCreateDevice(DriverObject, + 0, + (PUNICODE_STRING)&DeviceName, + FILE_DEVICE_UNKNOWN, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &Controller); + if (!NT_SUCCESS(Status)) goto Done; + + Status = IoCreateSymbolicLink((PUNICODE_STRING)&SymlinkName, + (PUNICODE_STRING)&DeviceName); + if (!NT_SUCCESS(Status)) + { + IoDeleteDevice(Controller); + goto Done; + } + + Controller->Flags &= ~DO_DEVICE_INITIALIZING; + + /* Save the Controller device */ + DriverExtension->Controller = Controller; + +Done: + DPRINT1("Done, Status = 0x%08lx\n", Status); + return Status; +} + +NTSTATUS NTAPI +ConDrvDeleteController(IN PDRIVER_OBJECT DriverObject) +{ + NTSTATUS Status = STATUS_SUCCESS; + PDEVICE_OBJECT Controller; + UNICODE_STRING SymlinkName; + + DPRINT1("Delete the Controller device...\n"); + + /* Retrieve the Controller device */ + Controller = ((PCONDRV_DRIVER)IoGetDriverObjectExtension(DriverObject, DriverObject))->Controller; + if (!Controller) return STATUS_OBJECT_TYPE_MISMATCH; + + RtlInitUnicodeString(&SymlinkName, DD_CONDRV_CTRL_SYMLNK_NAME_U); + IoDeleteSymbolicLink(&SymlinkName); + + /* Delete the controller device itself */ + IoDeleteDevice(Controller); + + DPRINT1("Done, Status = 0x%08lx\n", Status); + return Status; +} + +/* EOF */ Propchange: trunk/reactos/drivers/base/condrv/control.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/drivers/condrv/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Jul 7 15:15:10 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/include/reactos/drivers/condrv/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/include/reactos/drivers/condrv/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/include/reactos/drivers/condrv/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/include/reactos/drivers/condrv/ntddcon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/co… ============================================================================== --- trunk/reactos/include/reactos/drivers/condrv/ntddcon.h (added) +++ trunk/reactos/include/reactos/drivers/condrv/ntddcon.h [iso-8859-1] Sun Jul 7 15:15:10 2013 @@ -0,0 +1,145 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Driver + * FILE: include/reactos/drivers/condrv/ntddcon.h + * PURPOSE: Console Driver IOCTL Interface + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#if (_MSC_VER >= 1020) +#pragma once +#endif + +#ifndef _NTDDCON_H_ +#define _NTDDCON_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +// FIXME: Redo all the drawing since this one is quite old... + +/************************************************************************************************ + * Architecture of the Generic Terminal Driver + ************************************************************************************************ + +IN = CONIN$ = stdin +OUT = CONOUT$ = stdout +ERR = stderr + + +------------------------------+ + +-------------+ | +-----------------+ | + | |----- ERR ---->| |------+ | + | Console App |----- OUT ---->| Virtual Console |----+ | | + | 1 |<---- IN -----| 1-1 |--+ | | | + +-------------+ | +-----------------+ | | | | + | | | \ | + +-------------+ | +-----------------+ | | >--X----- ERR ----> + | |----- ERR ---->| |--|-|-/ | + | Console App |----- OUT ---->| Virtual Console |--|-+-----X----- OUT ----> + | 2 |<---- IN -----| 1-2 |--+---\ | + +-------------+ ^ | +-----------------+ \--X<---- IN ----- + | | | ^ + --+ | | . . . | | +\Console +-- \CurrentIn | | | | | + +-- \CurrentOut +----+ | | | + \CurrentErr | | Terminal 1 | | + --+ | | | + +------------------------------+ | + | + +----+----+ + . . . | \Input | + \Output + \Error + +*/ + +/* + * Remarks on the symbolic links : + * + * - \DosDevices\ is an alias to \??\ + * + * - Using "\DosDevices\Global\<name>" allows the driver to ALWAYS + * create the symbolic link in the global object namespace. Indeed, + * under Windows NT-2000, the \DosDevices\ directory was always + * global, but starting with Windows XP, it became local to a session. + * One would then use \GLOBAL??\ to access to the global directory. + * However, this name doesn't exist under Windows NT-2000. + * Therefore, we use the trick to use the 'Global' symbolic link + * defined both under Windows NT-2000 and Windows XP and later, + * which exists in \DosDevices\, to access to \??\ (global) under + * Windows NT-2000, and to \GLOBAL??\ under Windows XP and later. + */ + +// +// Controller device +// +#define DD_CONDRV_CTRL_DEVICE_NAME "\\Device\\ConDrv" +#define DD_CONDRV_CTRL_DEVICE_NAME_U L"\\Device\\ConDrv" +#define DD_CONDRV_CTRL_SYMLNK_NAME "\\DosDevices\\Global\\ConDrv" +#define DD_CONDRV_CTRL_SYMLNK_NAME_U L"\\DosDevices\\Global\\ConDrv" + + +// +// Console +// +#define DD_CONDRV_CONSOLE_DEVICE_NAME "\\Device\\Console" +#define DD_CONDRV_CONSOLE_DEVICE_NAME_U L"\\Device\\Console" +#define DD_CONDRV_CONSOLE_SYMLNK_NAME "\\DosDevices\\Global\\Console" +#define DD_CONDRV_CONSOLE_SYMLNK_NAME_U L"\\DosDevices\\Global\\Console" + + +#ifdef TELETYPE +// +// Virtual files associated with a given console +// +#define CONDRV_CONSOLE_FILE_CURRIN "\\CurrentIn" +#define CONDRV_CONSOLE_FILE_CURRIN_U L"\\CurrentIn" + +#define CONDRV_CONSOLE_FILE_CURROUT "\\CurrentOut" +#define CONDRV_CONSOLE_FILE_CURROUT_U L"\\CurrentOut" + +//#define CONDRV_CONSOLE_FILE_CURRERR "\\CurrentErr" +//#define CONDRV_CONSOLE_FILE_CURRERR_U L"\\CurrentErr" + +#define CONDRV_VC_FILE_SCRBUF "\\ScreenBuffer" +#define CONDRV_VC_FILE_SCRBUF_U L"\\ScreenBuffer" + +/*** Original names from Windows-8 condrv.sys *** + +L"\Connect" +L"\Reference" +L"\Server" +L"\Broker" + +L"\Console" +L"\Display" + +L"\Input" +L"\Output" +L"\CurrentIn" +L"\CurrentOut" +L"\ScreenBuffer" + +***/ + +#endif + + +// +// IO codes +// +#ifndef CTL_CODE + #error "CTL_CODE undefined. Include winioctl.h or wdm.h" +#endif + +#define IOCTL_CONDRV_CREATE_CONSOLE CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, FILE_ALL_ACCESS) +#define IOCTL_CONDRV_DELETE_CONSOLE CTL_CODE(FILE_DEVICE_UNKNOWN, 0x802, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +#ifdef __cplusplus +} +#endif + +#endif // _NTDDCON_H_ + +/* EOF */ Propchange: trunk/reactos/include/reactos/drivers/condrv/ntddcon.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 59446: [ATL] - Arch, don't forget to initialize your pointer
by tfaber＠svn.reactos.org 07 Jul '13

07 Jul '13

Author: tfaber Date: Sun Jul 7 13:41:18 2013 New Revision: 59446 URL: http://svn.reactos.org/svn/reactos?rev=59446&view=rev Log: [ATL] - Arch, don't forget to initialize your pointer Modified: trunk/reactos/lib/atl/atlbase.h Modified: trunk/reactos/lib/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlbase.h?rev=5944… ============================================================================== --- trunk/reactos/lib/atl/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlbase.h [iso-8859-1] Sun Jul 7 13:41:18 2013 @@ -595,6 +595,7 @@ ATLASSERT(ppv != NULL); if (ppv == NULL) return E_POINTER; + *ppv = NULL; hResult = S_OK; if (m_pObjMap != NULL) {

1 0

[ekohl] 59445: [SAMSRV] Start work on SamrChangePasswordUser. The new passwords can be stored but the required checks are still missing.
by ekohl＠svn.reactos.org 07 Jul '13

07 Jul '13

Author: ekohl Date: Sun Jul 7 12:45:03 2013 New Revision: 59445 URL: http://svn.reactos.org/svn/reactos?rev=59445&view=rev Log: [SAMSRV] Start work on SamrChangePasswordUser. The new passwords can be stored but the required checks are still missing. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Jul 7 12:45:03 2013 @@ -7469,8 +7469,86 @@ IN unsigned char LmCrossEncryptionPresent, IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithNewNt) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + ENCRYPTED_LM_OWF_PASSWORD StoredLmPassword; + ENCRYPTED_NT_OWF_PASSWORD StoredNtPassword; + PSAM_DB_OBJECT UserObject; + ULONG Length; + NTSTATUS Status; + + TRACE("(%p %u %u)\n", + UserHandle, LmPresent, NtPresent); + + /* Validate the user handle */ + Status = SampValidateDbObject(UserHandle, + SamDbUserObject, + USER_CHANGE_PASSWORD, + &UserObject); + if (!NT_SUCCESS(Status)) + { + TRACE("SampValidateDbObject failed with status 0x%08lx\n", Status); + return Status; + } + + /* Retrieve the LM password */ + Length = sizeof(ENCRYPTED_LM_OWF_PASSWORD); + Status = SampGetObjectAttribute(UserObject, + L"LMPwd", + NULL, + &StoredLmPassword, + &Length); + if (!NT_SUCCESS(Status)) + { + + } + + /* Retrieve the NT password */ + Length = sizeof(ENCRYPTED_NT_OWF_PASSWORD); + Status = SampGetObjectAttribute(UserObject, + L"NTPwd", + NULL, + &StoredNtPassword, + &Length); + if (!NT_SUCCESS(Status)) + { + + } + + /* FIXME: Check if the old passwords match the stored ones */ + + + /* Store the new LM password */ + if (LmPresent) + { + Length = sizeof(ENCRYPTED_LM_OWF_PASSWORD); + Status = SampSetObjectAttribute(UserObject, + L"LMPwd", + REG_BINARY, + NewLmEncryptedWithOldLm, + Length); + if (!NT_SUCCESS(Status)) + { + goto done; + } + } + + /* Store the new NT password */ + if (NtPresent) + { + Length = sizeof(ENCRYPTED_NT_OWF_PASSWORD); + Status = SampSetObjectAttribute(UserObject, + L"NTPwd", + REG_BINARY, + NewNtEncryptedWithOldNt, + Length); + if (!NT_SUCCESS(Status)) + { + goto done; + } + } + + +done: + return Status; }

1 0

[tfaber] 59444: [ATL] - Don't pretend success if we actually failed in CComModule::GetClassObject
by tfaber＠svn.reactos.org 07 Jul '13

07 Jul '13

Author: tfaber Date: Sun Jul 7 10:20:49 2013 New Revision: 59444 URL: http://svn.reactos.org/svn/reactos?rev=59444&view=rev Log: [ATL] - Don't pretend success if we actually failed in CComModule::GetClassObject Modified: trunk/reactos/lib/atl/atlbase.h Modified: trunk/reactos/lib/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlbase.h?rev=5944… ============================================================================== --- trunk/reactos/lib/atl/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlbase.h [iso-8859-1] Sun Jul 7 10:20:49 2013 @@ -617,6 +617,11 @@ objectMapEntry++; } } + if (hResult == S_OK && *ppv == NULL) + { + // FIXME: call AtlComModuleGetClassObject + hResult = CLASS_E_CLASSNOTAVAILABLE; + } return hResult; }

1 0

[tfaber] 59443: [CMAKE] - Try again to fix version detection. If anyone sees compilers that are not .00 versions, please complain. This is required because a simply "contains" check can match all p...
by tfaber＠svn.reactos.org 07 Jul '13

07 Jul '13

Author: tfaber Date: Sun Jul 7 09:42:57 2013 New Revision: 59443 URL: http://svn.reactos.org/svn/reactos?rev=59443&view=rev Log: [CMAKE] - Try again to fix version detection. If anyone sees compilers that are not .00 versions, please complain. This is required because a simply "contains" check can match all parts of the version number -- e.g. 16.00.40219.01 contains "19." in addition to "16." Modified: trunk/reactos/configure.cmd Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=59443&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sun Jul 7 09:42:57 2013 @@ -57,10 +57,11 @@ cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "ARM" > NUL && set ARCH=arm - cl 2>&1 | find "14." > NUL && set BUILD_ENVIRONMENT=VS8 - cl 2>&1 | find "15." > NUL && set BUILD_ENVIRONMENT=VS9 - cl 2>&1 | find "16." > NUL && set BUILD_ENVIRONMENT=VS10 - cl 2>&1 | find "17." > NUL && set BUILD_ENVIRONMENT=VS11 + cl 2>&1 | find "14.00." > NUL && set BUILD_ENVIRONMENT=VS8 + cl 2>&1 | find "15.00." > NUL && set BUILD_ENVIRONMENT=VS9 + cl 2>&1 | find "16.00." > NUL && set BUILD_ENVIRONMENT=VS10 + cl 2>&1 | find "17.00." > NUL && set BUILD_ENVIRONMENT=VS11 + ::cl 2>&1 | find "18.00." > NUL && set BUILD_ENVIRONMENT=VS12 if not defined BUILD_ENVIRONMENT ( echo Error: Visual Studio version too old or version detection failed. exit /b

1 0

[tfaber] 59442: [COM_APITEST] - Add a test verifying the interfaces exposed by various COM classes, grouped by server dll ROSTESTS-98
by tfaber＠svn.reactos.org 07 Jul '13

07 Jul '13

Author: tfaber Date: Sun Jul 7 09:10:31 2013 New Revision: 59442 URL: http://svn.reactos.org/svn/reactos?rev=59442&view=rev Log: [COM_APITEST] - Add a test verifying the interfaces exposed by various COM classes, grouped by server dll ROSTESTS-98 Added: trunk/rostests/apitests/com/ trunk/rostests/apitests/com/CMakeLists.txt (with props) trunk/rostests/apitests/com/browseui.c (with props) trunk/rostests/apitests/com/com_apitest.c (with props) trunk/rostests/apitests/com/com_apitest.h (with props) trunk/rostests/apitests/com/ieframe.c (with props) trunk/rostests/apitests/com/shdocvw.c (with props) trunk/rostests/apitests/com/shell32.c (with props) trunk/rostests/apitests/com/testlist.c (with props) Modified: trunk/rostests/apitests/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -3,6 +3,7 @@ add_subdirectory(advapi32) add_subdirectory(browseui) +add_subdirectory(com) add_subdirectory(crt) add_subdirectory(dciman32) add_subdirectory(gdi32) Added: trunk/rostests/apitests/com/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/CMakeLists.t… ============================================================================== --- trunk/rostests/apitests/com/CMakeLists.txt (added) +++ trunk/rostests/apitests/com/CMakeLists.txt [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -0,0 +1,17 @@ + +add_definitions(-DWINE_NO_UNICODE_MACROS) + +list(APPEND SOURCE + browseui.c + ieframe.c + shdocvw.c + shell32.c + com_apitest.c + testlist.c) + +add_executable(com_apitest ${SOURCE}) +target_link_libraries(com_apitest wine uuid) +set_module_type(com_apitest win32cui) +add_importlibs(com_apitest advapi32 ole32 shlwapi shell32 msvcrt kernel32 ntdll) + +add_cd_file(TARGET com_apitest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/apitests/com/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/rostests/apitests/com/browseui.c [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -0,0 +1,65 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: COM interface test for browseui classes + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include "com_apitest.h" + +#define NDEBUG +#include <debug.h> + +static const CLASS_AND_INTERFACES ExpectedInterfaces[] = +{ + { + ID_NAME(CLSID_RebarBandSite), + { + { 0x0, &IID_IUnknown }, + { 0xc, &IID_IBandSite }, + { 0x10, &IID_IInputObjectSite }, + { 0x14, &IID_IInputObject }, + { 0x18, &IID_IDeskBarClient }, + { 0x18, &IID_IOleWindow }, + { 0x1c, &IID_IWinEventHandler }, + { 0x20, &IID_IPersistStream }, + { 0x20, &IID_IPersist }, + { 0x24, &IID_IDropTarget }, + { 0x28, &IID_IServiceProvider }, + { 0x2c, &IID_IBandSiteHelper }, + { 0x30, &IID_IOleCommandTarget }, + } + }, + { + ID_NAME(CLSID_SH_AddressBand), + { + { 0x0, &IID_IDeskBand }, + { 0x0, &IID_IDockingWindow }, + { 0x0, &IID_IOleWindow }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IObjectWithSite }, + { 0xc, &IID_IInputObject }, + { 0x10, &IID_IPersistStream }, + { 0x10, &IID_IPersist }, + { 0x14, &IID_IOleCommandTarget }, + { 0x18, &IID_IServiceProvider }, + { 0x30, &IID_IWinEventHandler }, + { 0x34, &IID_IAddressBand }, + { 0x38, &IID_IInputObjectSite }, + } + }, + { + ID_NAME(CLSID_ShellSearchExt), + { + { 0x0, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IObjectWithSite }, + } + }, +}; +static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); + +START_TEST(browseui) +{ + TestClasses(L"browseui", ExpectedInterfaces, ExpectedInterfaceCount); +} Propchange: trunk/rostests/apitests/com/browseui.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -0,0 +1,459 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: COM interface test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include "com_apitest.h" + +#define NDEBUG +#include <debug.h> + +#define myskip(c, ...) ((c) ? 0 : (skip(__VA_ARGS__), 1)) +#define mytrace(...) do { \ + int debug = winetest_debug; \ + winetest_debug = 1; \ + trace(__VA_ARGS__); \ + winetest_debug = debug; \ +} while (0) + +typedef struct _KNOWN_INTERFACE +{ + const IID *iid; + PCSTR name; +} KNOWN_INTERFACE; +typedef const KNOWN_INTERFACE *PCKNOWN_INTERFACE; + +#undef ID_NAME +#define ID_NAME(c) { &c, #c } +static KNOWN_INTERFACE KnownInterfaces[] = +{ + ID_NAME(IID_IACList), + ID_NAME(IID_IACList2), + ID_NAME(IID_IAccessible), + ID_NAME(IID_IAddressBand), + ID_NAME(IID_IAddressEditBox), + ID_NAME(IID_IBandNavigate), + ID_NAME(IID_IBandProxy), + ID_NAME(IID_IBandSite), + ID_NAME(IID_IBandSiteHelper), + ID_NAME(IID_IBanneredBar), + ID_NAME(IID_IBindCtx), + ID_NAME(IID_IBrowserService), + ID_NAME(IID_IBrowserService2), + ID_NAME(IID_IClassFactory), + ID_NAME(IID_IClassFactory2), + ID_NAME(IID_IClassFactory3), + ID_NAME(IID_IClientSecurity), + ID_NAME(IID_IComThreadingInfo), + ID_NAME(IID_IContextMenu), + ID_NAME(IID_IContextMenu2), + ID_NAME(IID_IContextMenu3), + ID_NAME(IID_IContextMenuCB), + ID_NAME(IID_IContextMenuSite), + ID_NAME(IID_IContinue), + ID_NAME(IID_IDataObject), + ID_NAME(IID_IDefViewFrame), + ID_NAME(IID_IDeskBand), + ID_NAME(IID_IDeskBar), + ID_NAME(IID_IDeskBarClient), + ID_NAME(IID_IDispatch), + ID_NAME(IID_IDockingWindow), + ID_NAME(IID_IDockingWindowFrame), + ID_NAME(IID_IDockingWindowSite), + ID_NAME(IID_IDocViewSite), + ID_NAME(IID_IDragSourceHelper), + ID_NAME(IID_IDropSource), + ID_NAME(IID_IDropTarget), + ID_NAME(IID_IDropTargetHelper), + ID_NAME(IID_IEnumExtraSearch), + ID_NAME(IID_IEnumGUID), + ID_NAME(IID_IEnumIDList), + ID_NAME(IID_IEnumShellItems), + ID_NAME(IID_IEnumString), + ID_NAME(IID_IEnumUnknown), + ID_NAME(IID_IErrorLog), + ID_NAME(IID_IExplorerToolbar), + ID_NAME(IID_IExtractIconA), + ID_NAME(IID_IExtractIconW), + ID_NAME(IID_IExtractImage), + ID_NAME(IID_IExtractImage2), + ID_NAME(IID_IFileDialog), + ID_NAME(IID_IFileDialog2), + ID_NAME(IID_IFileSearchBand), + ID_NAME(IID_IFolderBandPriv), + ID_NAME(IID_IFolderView), + ID_NAME(IID_IFolderView2), + ID_NAME(IID_IFolderViewOC), + ID_NAME(IID_IFolderViewSettings), + ID_NAME(IID_IGlobalFolderSettings), + ID_NAME(IID_IInitializeObject), + ID_NAME(IID_IInputObject), + ID_NAME(IID_IInputObjectSite), + ID_NAME(IID_IInternalUnknown), + ID_NAME(IID_IMarshal), + ID_NAME(IID_IMenuBand), + ID_NAME(IID_IMenuPopup), + ID_NAME(IID_IMoniker), + ID_NAME(IID_IMultiQI), + ID_NAME(IID_INamespaceProxy), + ID_NAME(IID_INameSpaceTreeControl), + ID_NAME(IID_INSCTree), + ID_NAME(IID_INSCTree2), + ID_NAME(IID_IObjMgr), + ID_NAME(IID_IObjectSafety), + ID_NAME(IID_IObjectWithSite), + ID_NAME(IID_IOleCommandTarget), + ID_NAME(IID_IOleInPlaceActiveObject), + ID_NAME(IID_IOleInPlaceFrame), + ID_NAME(IID_IOleInPlaceObject), + ID_NAME(IID_IOleInPlaceObjectWindowless), + ID_NAME(IID_IOleInPlaceSite), + ID_NAME(IID_IOleInPlaceSiteEx), + ID_NAME(IID_IOleInPlaceSiteWindowless), + ID_NAME(IID_IOleInPlaceUIWindow), + ID_NAME(IID_IOleObject), + ID_NAME(IID_IOleWindow), + ID_NAME(IID_IPersist), + ID_NAME(IID_IPersistFile), + ID_NAME(IID_IPersistFolder), + ID_NAME(IID_IPersistFolder2), + ID_NAME(IID_IPersistFolder3), + ID_NAME(IID_IPersistHistory), + ID_NAME(IID_IPersistIDList), + ID_NAME(IID_IPersistMemory), + ID_NAME(IID_IPersistPropertyBag), + ID_NAME(IID_IPersistPropertyBag2), + ID_NAME(IID_IPersistStorage), + ID_NAME(IID_IPersistStream), + ID_NAME(IID_IPersistStreamInit), + ID_NAME(IID_IProgressDialog), + ID_NAME(IID_IPropertyBag), + ID_NAME(IID_IPropertyBag2), + ID_NAME(IID_IQueryAssociations), + ID_NAME(IID_IQueryInfo), + ID_NAME(IID_IRegTreeOptions), + ID_NAME(IID_IRunnableObject), + ID_NAME(IID_IServerSecurity), + ID_NAME(IID_IServiceProvider), + ID_NAME(IID_IShellBrowser), + ID_NAME(IID_IShellBrowserService), + ID_NAME(IID_IShellChangeNotify), + ID_NAME(IID_IShellDesktopTray), + ID_NAME(IID_IShellDispatch), + ID_NAME(IID_IShellDispatch2), + ID_NAME(IID_IShellDispatch3), + ID_NAME(IID_IShellDispatch4), + ID_NAME(IID_IShellDispatch5), + ID_NAME(IID_IShellIconOverlayIdentifier), + ID_NAME(IID_IShellFolder), + ID_NAME(IID_IShellFolder2), + ID_NAME(IID_IShellFolderBand), + ID_NAME(IID_IShellFolderView), + ID_NAME(IID_IShellFolderViewCB), + ID_NAME(IID_IShellFolderViewDual), + ID_NAME(IID_IShellFolderViewDual2), + ID_NAME(IID_IShellIcon), + ID_NAME(IID_IShellItem), + ID_NAME(IID_IShellItem2), + ID_NAME(IID_IShellItemArray), + ID_NAME(IID_IShellItemFilter), + ID_NAME(IID_IShellLinkA), + ID_NAME(IID_IShellLinkDual), + ID_NAME(IID_IShellLinkDual2), + ID_NAME(IID_IShellLinkW), + ID_NAME(IID_IShellMenu), + ID_NAME(IID_IShellMenu2), + ID_NAME(IID_IShellMenuAcc), + ID_NAME(IID_IShellMenuCallback), + ID_NAME(IID_IShellService), + ID_NAME(IID_IShellView), + ID_NAME(IID_IShellView2), + ID_NAME(IID_IShellView3), + ID_NAME(IID_IShellWindows), + ID_NAME(IID_IStream), + ID_NAME(IID_ISurrogate), + ID_NAME(IID_ISynchronize), + ID_NAME(IID_ISynchronizeContainer), + ID_NAME(IID_ISynchronizeEvent), + ID_NAME(IID_ISynchronizeHandle), + ID_NAME(IID_ITaskbarList), + ID_NAME(IID_ITaskbarList2), + ID_NAME(IID_ITrackShellMenu), + ID_NAME(IID_ITrayPriv), + ID_NAME(IID_ITrayPriv2), + ID_NAME(IID_IUnknown), + ID_NAME(IID_IViewObject), + ID_NAME(IID_IViewObject2), + ID_NAME(IID_IWinEventHandler), + + ID_NAME(IID_DFConstraint), + ID_NAME(DIID_DShellFolderViewEvents), + + ID_NAME(IID_Folder), + ID_NAME(IID_Folder2), + ID_NAME(IID_Folder3), + ID_NAME(IID_FolderItem), + ID_NAME(IID_FolderItem2), + ID_NAME(IID_FolderItems), + ID_NAME(IID_FolderItems2), + ID_NAME(IID_FolderItems3), + ID_NAME(IID_FolderItemVerb), + ID_NAME(IID_FolderItemVerbs), +}; +static const INT KnownInterfaceCount = RTL_NUMBER_OF(KnownInterfaces); + +static +PCKNOWN_INTERFACE +FindInterface( + _In_ const IID *iid) +{ + INT i; + + for (i = 0; i < KnownInterfaceCount; i++) + if (IsEqualIID(KnownInterfaces[i].iid, iid)) + return &KnownInterfaces[i]; + ASSERT(i != KnownInterfaceCount); + return NULL; +} + +static +BOOLEAN +IsInterfaceExpected( + _In_ PCCLASS_AND_INTERFACES class, + _In_ const IID *iid) +{ + INT i; + + for (i = 0; class->ifaces[i].iid; i++) + if (IsEqualIID(class->ifaces[i].iid, iid)) + return TRUE; + return FALSE; +} + +#define INTF_NOT_EXPOSED LONG_MAX +static +LONG +GetInterfaceOffset( + _In_ PUNKNOWN pUnk, + _In_ const IID *iid) +{ + HRESULT hr; + PVOID pObj; + PUNKNOWN pUnk2; + LONG offset; + + hr = IUnknown_QueryInterface(pUnk, iid, &pObj); + ok(hr == S_OK || hr == E_NOINTERFACE, "IUnknown::QueryInterface returned 0x%lx\n", hr); + if (FAILED(hr)) + return INTF_NOT_EXPOSED; + + pUnk2 = pObj; + offset = (LONG_PTR)pObj - (LONG_PTR)pUnk; + IUnknown_Release(pUnk2); + return offset; +} + +static +VOID +TestModuleInterfaces( + _In_ PCCLASS_AND_INTERFACES ExpectedInterfaces, + _In_ INT ExpectedInterfaceCount) +{ + HRESULT hr; + PVOID pObj; + PUNKNOWN pUnk; + INT iClass, iIntf; + PCCLASS_AND_INTERFACES class; + + for (iClass = 0; iClass < ExpectedInterfaceCount; iClass++) + { + class = &ExpectedInterfaces[iClass]; + hr = CoCreateInstance(class->clsid, + NULL, + CLSCTX_INPROC_SERVER, + &IID_IUnknown, + &pObj); + ok(hr == S_OK, "CoCreateInstance failed. hr=0x%lx\n", hr); + if (FAILED(hr)) + { + skip("Failed to instantiate %s.\n", class->name); + continue; + } + + pUnk = pObj; + + /* Check that all expected interfaces are present and have the right offset */ + for (iIntf = 0; class->ifaces[iIntf].iid; iIntf++) + { + PCKNOWN_INTERFACE iface = FindInterface(class->ifaces[iIntf].iid); + LONG offset = GetInterfaceOffset(pUnk, iface->iid); + if (offset == INTF_NOT_EXPOSED) + ok(0, "%s is missing %s (offset %ld)\n", class->name, iface->name, class->ifaces[iIntf].offset); + else if (class->ifaces[iIntf].offset != FARAWY) + { +#ifdef FAIL_WRONG_OFFSET + ok(offset == class->ifaces[iIntf].offset, "%s, %s offset is %ld, expected %ld\n", class->name, iface->name, offset, class->ifaces[iIntf].offset); +#else + if (offset != class->ifaces[iIntf].offset) + mytrace("%s, %s offset is %ld, expected %ld\n", class->name, iface->name, offset, class->ifaces[iIntf].offset); +#endif + } + } + + /* Check that none other than the expected interfaces are present */ + for (iIntf = 0; iIntf < KnownInterfaceCount; iIntf++) + { + PCKNOWN_INTERFACE iface = &KnownInterfaces[iIntf]; + LONG offset; + if (IsInterfaceExpected(class, iface->iid)) + continue; + offset = GetInterfaceOffset(pUnk, iface->iid); +#ifdef GENERATE_TABLE_ENTRIES + ok(offset == INTF_NOT_EXPOSED, "%s: { %s%x, &%s },\n", class->name, offset < 0 ? "-" : "", offset < 0 ? -offset : offset, iface->name); +#else + ok(offset == INTF_NOT_EXPOSED, "%s exposes %s (offset %ld), but shouldn't\n", class->name, iface->name, offset); +#endif + } + + // TODO: do some aggregation + + IUnknown_Release(pUnk); + } +} + +static +VOID +TestModuleRegistry( + _In_ PCWSTR ModuleName, + _In_ PCCLASS_AND_INTERFACES ExpectedInterfaces, + _In_ INT ExpectedInterfaceCount) +{ + INT iClass; + PCCLASS_AND_INTERFACES class; + HKEY hKeyClasses; + LONG result; + + result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"Software\\Classes\\CLSID", 0, KEY_ENUMERATE_SUB_KEYS, &hKeyClasses); + ok(result == NO_ERROR, "Failed to open classes key, error %lu\n", result); + if (!myskip(result == NO_ERROR, "No classes key\n")) + { + for (iClass = 0; iClass < ExpectedInterfaceCount; iClass++) + { + HKEY hKey; + HKEY hKeyServer; + NTSTATUS status; + UNICODE_STRING clsid; + DWORD type; + WCHAR dllName[100]; + DWORD dllNameSize; + + class = &ExpectedInterfaces[iClass]; + status = RtlStringFromGUID(class->clsid, &clsid); + ok(status == STATUS_SUCCESS, "Failed to convert guid to string for %s, status %lx\n", class->name, status); + if (myskip(NT_SUCCESS(status), "No guid string\n")) + continue; + + result = RegOpenKeyEx(hKeyClasses, clsid.Buffer, 0, KEY_ENUMERATE_SUB_KEYS, &hKey); + ok(result == NO_ERROR, "Failed to open key for %s, error %lu\n", class->name, result); + RtlFreeUnicodeString(&clsid); + if (myskip(result == NO_ERROR, "No key\n")) + continue; + + result = RegOpenKeyEx(hKey, L"InProcServer32", 0, KEY_QUERY_VALUE, &hKeyServer); + ok(result == NO_ERROR, "Failed to open key for %s, error %lu\n", class->name, result); + RegCloseKey(hKey); + if (myskip(result == NO_ERROR, "No key\n")) + continue; + + dllNameSize = sizeof(dllName); + result = RegQueryValueEx(hKeyServer, NULL, NULL, &type, (PBYTE)dllName, &dllNameSize); + ok(result == NO_ERROR, "Failed to query value for %s, error %lu\n", class->name, result); + if (!myskip(result == NO_ERROR, "No module name\n")) + { + ok(type == REG_SZ || type == REG_EXPAND_SZ, "type %lu for %s\n", type, class->name); + ok(dllNameSize % sizeof(WCHAR) == 0, "size %lu for %s\n", dllNameSize, class->name); + ok(dllNameSize <= sizeof(dllName), "size %lu for %s\n", dllNameSize, class->name); + ok(dllName[dllNameSize / sizeof(WCHAR) - 1] == UNICODE_NULL, "Not null terminated for %s\n", class->name); + // TODO: Use SearchPath (or assume everything's in system32) and do a proper full path compare + PathStripPathW(dllName); + PathRemoveExtensionW(dllName); + ok(!wcsicmp(dllName, ModuleName), "Server is %ls, expected %ls for %s\n", dllName, ModuleName, class->name); + } + + dllNameSize = sizeof(dllName); + result = RegQueryValueEx(hKeyServer, L"ThreadingModel", NULL, &type, (PBYTE)dllName, &dllNameSize); + ok(result == NO_ERROR, "Failed to query value for %s, error %lu\n", class->name, result); + if (!myskip(result == NO_ERROR, "No ThreadingModel\n")) + { + ok(type == REG_SZ || type == REG_EXPAND_SZ, "type %lu for %s\n", type, class->name); + ok(dllNameSize % sizeof(WCHAR) == 0, "size %lu for %s\n", dllNameSize, class->name); + ok(dllNameSize <= sizeof(dllName), "size %lu for %s\n", dllNameSize, class->name); + ok(dllName[dllNameSize / sizeof(WCHAR) - 1] == UNICODE_NULL, "Not null terminated for %s\n", class->name); + ok(!wcsicmp(dllName, L"Apartment"), "Server is %ls, expected %ls for %s\n", dllName, L"Apartment", class->name); + } + + RegCloseKey(hKeyServer); + } + RegCloseKey(hKeyClasses); + } +} + +static +VOID +TestManualInstantiation( + _In_ PCWSTR ModuleName, + _In_ PCCLASS_AND_INTERFACES ExpectedInterfaces, + _In_ INT ExpectedInterfaceCount) +{ + INT iClass; + PCCLASS_AND_INTERFACES class; + HRESULT (__stdcall *DllGetClassObject)(REFCLSID, REFIID, PVOID *); + + DllGetClassObject = (PVOID)GetProcAddress(GetModuleHandle(ModuleName), "DllGetClassObject"); + ok(DllGetClassObject != NULL, "DllGetClassObject not found in %ls, error %lu\n", ModuleName, GetLastError()); + if (myskip(DllGetClassObject != NULL, "No DllGetClassObject\n")) + return; + + for (iClass = 0; iClass < ExpectedInterfaceCount; iClass++) + { + PVOID pv; + HRESULT hr; + class = &ExpectedInterfaces[iClass]; + hr = DllGetClassObject(class->clsid, &IID_IClassFactory, &pv); + ok(hr == S_OK, "DllGetClassObject failed for %s, hr = 0x%lx\n", class->name, hr); + if (!myskip(SUCCEEDED(hr), "No class factory\n")) + { + IClassFactory *pCF = pv; + hr = IClassFactory_CreateInstance(pCF, NULL, &IID_IUnknown, &pv); + ok(hr == S_OK, "IClassFactory::CreateInstance failed for %s, hr = 0x%lx\n", class->name, hr); + if (SUCCEEDED(hr)) + { + IUnknown *pUnk = pv; + IUnknown_Release(pUnk); + } + IClassFactory_Release(pCF); + } + } +} + +VOID +TestClasses( + _In_ PCWSTR ModuleName, + _In_ PCCLASS_AND_INTERFACES ExpectedInterfaces, + _In_ INT ExpectedInterfaceCount) +{ + HRESULT hr; + + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "CoInitializeEx failed. hr=0x%lx\n", hr); + if (myskip(SUCCEEDED(hr), "Failed to initialize COM. Cannot perform tests\n")) + return; + + TestModuleInterfaces(ExpectedInterfaces, ExpectedInterfaceCount); + TestModuleRegistry(ModuleName, ExpectedInterfaces, ExpectedInterfaceCount); + TestManualInstantiation(ModuleName, ExpectedInterfaces, ExpectedInterfaceCount); + + CoUninitialize(); +} Propchange: trunk/rostests/apitests/com/com_apitest.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -0,0 +1,108 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: COM interface test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#pragma once + +/* Define this if you're adding new classes - the test will auto-generate the + * interface table entries for you ;) */ +//#define GENERATE_TABLE_ENTRIES + +/* Define this to make wrong interface offsets count as test failures... + * we usually don't want to be that strict */ +//#define FAIL_WRONG_OFFSET + +#define COBJMACROS +#define WIN32_NO_STATUS +#define UNICODE +#include <wine/test.h> +#include <objbase.h> +#include <objsafe.h> +#include <oleacc.h> +#include <oaidl.h> +#include <mshtmhst.h> +#include <perhist.h> +#include <shlguid.h> +#include <shlobj.h> +#include <shobjidl.h> +#include <shldisp.h> +#include <shdeprecated.h> +#include <shlobj_undoc.h> +#include <shlguid_undoc.h> +#include <shlwapi.h> +#include <ndk/rtlfuncs.h> +#include <initguid.h> + +#define RTL_NUMBER_OF(x) (sizeof(x) / sizeof(x[0])) +typedef IUnknown *PUNKNOWN; + +typedef struct _CLASS_AND_INTERFACES +{ + const CLSID *clsid; + PCSTR name; + struct + { + LONG offset; + const IID *iid; + } ifaces[80]; +} CLASS_AND_INTERFACES; +typedef const CLASS_AND_INTERFACES *PCCLASS_AND_INTERFACES; + +#define ID_NAME(c) &c, #c + +VOID +TestClasses( + _In_ PCWSTR ModuleName, + _In_ PCCLASS_AND_INTERFACES ExpectedInterfaces, + _In_ INT ExpectedInterfaceCount); + +/* Indicate that the interface is implemented in another (probably aggregate) object, + * so its offset varies and is "far away" */ +#define FARAWY (-65535) + +// TODO: fix our headers... we really shouldn't need these here +DEFINE_GUID(CLSID_CopyToMenu, 0xC2FBB630, 0x2971, 0x11D1, 0xA1, 0x8C, 0x00, 0xC0, 0x4F, 0xD7, 0x5D, 0x13); +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_FileSearchBand, 0xc4ee31f3, 0x4768, 0x11d2, 0xbe, 0x5c, 0x00, 0xa0, 0xc9, 0xa8, 0x3d, 0xa1); +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_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); +DEFINE_GUID(CLSID_MoveToMenu, 0xC2FBB631, 0x2971, 0x11D1, 0xA1, 0x8C, 0x00, 0xC0, 0x4F, 0xD7, 0x5D, 0x13); +DEFINE_GUID(CLSID_QuickLinks, 0x0E5CBF21, 0xD15F, 0x11D0, 0x83, 0x01, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); +DEFINE_GUID(CLSID_SendToMenu, 0x7BA4C740, 0x9E81, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); +DEFINE_GUID(CLSID_ShellFolderView, 0x62112aa1, 0xebe4, 0x11cf, 0xa5, 0xfb, 0x00, 0x20, 0xaf, 0xe7, 0x29, 0x2d); +DEFINE_GUID(CLSID_ShellLinkObject, 0x11219420, 0x1768, 0x11d1, 0x95, 0xbe, 0x00, 0x60, 0x97, 0x97, 0xea, 0x4f); +DEFINE_GUID(CLSID_StartMenuPin, 0xa2a9545d, 0xa0c2, 0x42b4, 0x97, 0x08, 0xa0, 0xb2, 0xba, 0xdd, 0x77, 0xc8); +DEFINE_GUID(CLSID_TrackShellMenu, 0x8278F931, 0x2A3E, 0x11d2, 0x83, 0x8F, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0); + +DEFINE_GUID(IID_IDefViewFrame, 0x710EB7A0, 0x45ED, 0x11D0, 0x92, 0x4A, 0x00, 0x20, 0xAF, 0xC7, 0xAC, 0x4D); +DEFINE_GUID(IID_IDocViewSite, 0x87D605E0, 0xC511, 0x11CF, 0x89, 0xA9, 0x00, 0xA0, 0xC9, 0x05, 0x41, 0x29); +DEFINE_GUID(IID_IExtractImage, 0xbb2e617c, 0x0920, 0x11d1, 0x9a, 0x0b, 0x00, 0xc0, 0x4f, 0xc2, 0xd6, 0xc1); +DEFINE_GUID(IID_IExtractImage2, 0x953bb1ee, 0x93b4, 0x11d1, 0x98, 0xa3, 0x00, 0xc0, 0x4f, 0xb6, 0x87, 0xda); +DEFINE_GUID(IID_IFileSearchBand, 0x2d91eea1, 0x9932, 0x11d2, 0xbe, 0x86, 0x00, 0xa0, 0xc9, 0xa8, 0x3d, 0xa1); +DEFINE_GUID(IID_IFolderBandPriv, 0x47c01f95, 0xe185, 0x412c, 0xb5, 0xc5, 0x4f, 0x27, 0xdf, 0x96, 0x5a, 0xea); +DEFINE_GUID(IID_IFolderView2, 0x1af3a467, 0x214f, 0x4298, 0x90, 0x8e, 0x06, 0xb0, 0x3e, 0x0b, 0x39, 0xf9); +DEFINE_GUID(IID_IFolderViewSettings, 0xae8c987d, 0x8797, 0x4ed3, 0xbe, 0x72, 0x2a, 0x47, 0xdd, 0x93, 0x8d, 0xb0); +DEFINE_GUID(IID_IShellDispatch3, 0x177160ca, 0xbb5a, 0x411c, 0x84, 0x1d, 0xbd, 0x38, 0xfa, 0xcd, 0xea, 0xa0); +DEFINE_GUID(IID_IShellDispatch4, 0xefd84b2d, 0x4bcf, 0x4298, 0xbe, 0x25, 0xeb, 0x54, 0x2a, 0x59, 0xfb, 0xda); +DEFINE_GUID(IID_IShellDispatch5, 0x866738b9, 0x6cf2, 0x4de8, 0x87, 0x67, 0xf7, 0x94, 0xeb, 0xe7, 0x4f, 0x4e); +DEFINE_GUID(IID_IContextMenuSite, 0x0811aebe, 0x0b87, 0x4c54, 0x9e, 0x72, 0x54, 0x8c, 0xf6, 0x49, 0x01, 0x6b); +DEFINE_GUID(IID_IShellDesktopTray, 0x213e2df9, 0x9a14, 0x4328, 0x99, 0xb1, 0x69, 0x61, 0xf9, 0x14, 0x3c, 0xe9); +DEFINE_GUID(IID_IShellFolderBand, 0x7fe80cc8, 0xc247, 0x11d0, 0xb9, 0x3a, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1); +DEFINE_GUID(IID_IShellFolderViewDual, 0xe7a1af80, 0x4d96, 0x11cf, 0x96, 0x0c, 0x00, 0x80, 0xc7, 0xf4, 0xee, 0x85); +DEFINE_GUID(IID_IShellFolderViewDual2, 0x31c147b6, 0x0ade, 0x4a3c, 0xb5, 0x14, 0xdd, 0xf9, 0x32, 0xef, 0x6d, 0x17); +DEFINE_GUID(IID_IShellLinkDual, 0x88a05c00, 0xf000, 0x11ce, 0x83, 0x50, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); +DEFINE_GUID(IID_IShellLinkDual2, 0x317ee249, 0xf12e, 0x11d2, 0xb1, 0xe4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); +DEFINE_GUID(IID_IShellView3, 0xec39fa88, 0xf8af, 0x41c5, 0x84, 0x21, 0x38, 0xbe, 0xd2, 0x8f, 0x46, 0x73); + +DEFINE_GUID(IID_DFConstraint, 0x403df050, 0x23bd, 0x11d2, 0x93, 0x9f, 0x00, 0xa0, 0xc9, 0x1e, 0xed, 0xba); + +DEFINE_GUID(IID_FolderItems2, 0xc94f0ad0, 0xf363, 0x11d2, 0xa3, 0x27, 0x00, 0xc0, 0x4f, 0x8e, 0xec, 0x7f); +DEFINE_GUID(IID_FolderItems3, 0xeaa7c309, 0xbbec, 0x49d5, 0x82, 0x1d, 0x64, 0xd9, 0x66, 0xcb, 0x66, 0x7f); Propchange: trunk/rostests/apitests/com/com_apitest.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/com/ieframe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/ieframe.c?re… ============================================================================== --- trunk/rostests/apitests/com/ieframe.c (added) +++ trunk/rostests/apitests/com/ieframe.c [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: COM interface test for ieframe classes + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include "com_apitest.h" + +#define NDEBUG +#include <debug.h> + +static const CLASS_AND_INTERFACES ExpectedInterfaces[] = +{ + { + ID_NAME(CLSID_ShellWindows), + { + { -0xa0, &IID_IMarshal }, + { -0x20, &IID_IClientSecurity }, + { 0x0, &IID_IMultiQI }, + { 0x0, &IID_IUnknown }, + { FARAWY, &IID_IShellWindows }, + { FARAWY, &IID_IDispatch }, + } + }, +}; +static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); + +START_TEST(ieframe) +{ + TestClasses(L"ieframe", ExpectedInterfaces, ExpectedInterfaceCount); +} Propchange: trunk/rostests/apitests/com/ieframe.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/com/shdocvw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shdocvw.c?re… ============================================================================== --- trunk/rostests/apitests/com/shdocvw.c (added) +++ trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -0,0 +1,57 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: COM interface test for shdocvw classes + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include "com_apitest.h" + +#define NDEBUG +#include <debug.h> + +static const CLASS_AND_INTERFACES ExpectedInterfaces[] = +{ + { + ID_NAME(CLSID_FontsFolderShortcut), + { + { 0x0, &IID_IShellFolder2 }, + { 0x0, &IID_IShellFolder }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistFolder3 }, + { 0x4, &IID_IPersistFolder2 }, + { 0x4, &IID_IPersistFolder }, + { 0x4, &IID_IPersist }, + { 0x8, &IID_IShellLinkA }, + { 0xc, &IID_IShellLinkW }, + { 0x10, &IID_IPersistFile }, + { 0x14, &IID_IExtractIconW }, + { 0x18, &IID_IQueryInfo }, + { 0x20, &IID_IPersistStream }, + { 0x20, &IID_IPersistStreamInit }, + { 0x24, &IID_IPersistPropertyBag }, + } + }, +#if 0 // E_OUTOFMEMORY? + { + ID_NAME(CLSID_ShellDispatchInproc), + { + { 0x0, &IID_IUnknown }, + } + }, +#endif + { + ID_NAME(CLSID_TaskbarList), + { + { 0x0, &IID_ITaskbarList2 }, + { 0x0, &IID_ITaskbarList }, + { 0x0, &IID_IUnknown }, + } + }, +}; +static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); + +START_TEST(shdocvw) +{ + TestClasses(L"shdocvw", ExpectedInterfaces, ExpectedInterfaceCount); +} Propchange: trunk/rostests/apitests/com/shdocvw.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -0,0 +1,437 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: COM interface test for shell32 classes + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include "com_apitest.h" + +#define NDEBUG +#include <debug.h> + +static const CLASS_AND_INTERFACES ExpectedInterfaces[] = +{ + { + ID_NAME(CLSID_CopyToMenu), + { + { 0x0, &IID_IContextMenu3 }, + { 0x0, &IID_IContextMenu2 }, + { 0x0, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_DeskMovr), + { + { 0x0, &IID_IUnknown }, + { 0x74, &IID_IOleObject }, + { 0x78, &IID_IPersistPropertyBag }, + { 0x80, &IID_IOleInPlaceActiveObject }, + { 0x84, &IID_IViewObject2 }, + { 0x84, &IID_IViewObject }, + { 0x88, &IID_IOleWindow }, + { 0x88, &IID_IOleInPlaceObject }, + { 0x88, &IID_IOleInPlaceObjectWindowless }, + } + }, + { + ID_NAME(CLSID_DragDropHelper), + { + { 0x0, &IID_IDragSourceHelper }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IDropTargetHelper }, + } + }, + { + ID_NAME(CLSID_FadeTask), + { + { 0x0, &IID_IUnknown }, + } + }, + { + ID_NAME(CLSID_FileSearchBand), + { + { 0x0, &IID_IFileSearchBand }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IObjectWithSite }, + { 0x8, &IID_IPersistStream }, + { 0x8, &IID_IPersist }, + { 0xc, &IID_IDeskBand }, + { 0xc, &IID_IDockingWindow }, + { 0xc, &IID_IOleWindow }, + { 0x10, &IID_IInputObject }, + { 0x18, &IID_IOleInPlaceSite }, + } + }, + { + ID_NAME(CLSID_FolderItem), + { + //{ 0x0, &CLSID_ShellFolderItem }, // broken QueryInterface that doesn't add a reference + { 0x0, &IID_FolderItem2 }, + { 0x0, &IID_FolderItem }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistFolder2 }, + { 0x4, &IID_IPersistFolder }, + { 0x4, &IID_IPersist }, + { 0x8, &IID_IObjectSafety }, + } + }, + { + ID_NAME(CLSID_FolderItemsFDF), + { + { 0x0, &IID_FolderItems3 }, + //{ 0x0, &IID_FolderItems2 }, ???? + { 0x0, &IID_FolderItems }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistFolder }, + { 0x8, &IID_IObjectSafety }, + } + }, + { + ID_NAME(CLSID_FolderShortcut), + { + { 0x0, &IID_IShellFolder2 }, + { 0x0, &IID_IShellFolder }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistFolder3 }, + { 0x4, &IID_IPersistFolder2 }, + { 0x4, &IID_IPersistFolder }, + { 0x4, &IID_IPersist }, + { 0x8, &IID_IShellLinkA }, + { 0xc, &IID_IShellLinkW }, + { 0x10, &IID_IPersistFile }, + { 0x14, &IID_IExtractIconW }, + { 0x18, &IID_IQueryInfo }, + { 0x20, &IID_IPersistStream }, + { 0x20, &IID_IPersistStreamInit }, + { 0x24, &IID_IPersistPropertyBag }, + } + }, + { + ID_NAME(CLSID_FolderViewHost), + { + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IServiceProvider }, + { 0x8, &IID_IOleWindow }, + { 0xc, &IID_IFolderView }, + { 0x10, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_ISFBand), + { + { -0xac, &IID_IDeskBand }, + { -0xac, &IID_IDockingWindow }, + { -0xac, &IID_IOleWindow }, + { -0xa8, &IID_IObjectWithSite }, + { -0xa0, &IID_IInputObject }, + { -0x9c, &IID_IPersistStream }, + { -0x9c, &IID_IPersist }, + { -0x98, &IID_IOleCommandTarget }, + { -0x94, &IID_IServiceProvider }, + { -0x78, &IID_IWinEventHandler }, + { -0x74, &IID_IShellChangeNotify }, + { -0x70, &IID_IDropTarget }, + { -0x4, &IID_IContextMenu }, + { 0x0, &IID_IShellFolderBand }, + { 0x0, &IID_IUnknown }, + { 0x94, &IID_IFolderBandPriv }, + } + }, + { + ID_NAME(CLSID_MenuBand), + { + { -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_IMenuPopup }, + { 0x0, &IID_IDeskBar }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IMenuBand }, + { 0x8, &IID_IShellMenu2 }, + { 0x8, &IID_IShellMenu }, + { 0xc, &IID_IWinEventHandler }, + { 0x10, &IID_IShellMenuAcc }, + } + }, + { + ID_NAME(CLSID_MenuBandSite), + { + { 0x0, &IID_IBandSite }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IDeskBarClient }, + { 0x4, &IID_IOleWindow }, + { 0x8, &IID_IOleCommandTarget }, + { 0xc, &IID_IInputObject }, + { 0x10, &IID_IInputObjectSite }, + { 0x14, &IID_IWinEventHandler }, + { 0x18, &IID_IServiceProvider }, + } + }, + { + ID_NAME(CLSID_MenuDeskBar), + { + { -0x48, &IID_IOleCommandTarget }, + { -0x44, &IID_IServiceProvider }, + { -0x40, &IID_IDeskBar }, + { -0x40, &IID_IOleWindow }, + { -0x3c, &IID_IInputObjectSite }, + { -0x38, &IID_IInputObject }, + { 0x0, &IID_IMenuPopup }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IObjectWithSite }, + { 0x8, &IID_IBanneredBar }, + { 0xc, &IID_IInitializeObject }, + } + }, +#if 0 // This is registered to shell32, but can't be instanciated + { + ID_NAME(CLSID_MenuToolbarBase), + { + { 0x0, &IID_IUnknown }, + } + }, +#endif + { + ID_NAME(CLSID_MoveToMenu), + { + { 0x0, &IID_IContextMenu3 }, + { 0x0, &IID_IContextMenu2 }, + { 0x0, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_NewMenu), + { + { -0xc, &IID_IObjectWithSite }, + { -0x4, &IID_IContextMenu3 }, + { -0x4, &IID_IContextMenu2 }, + { -0x4, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + } + }, + { + ID_NAME(CLSID_PersonalStartMenu), + { + { -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_IMenuPopup }, + { 0x0, &IID_IDeskBar }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IMenuBand }, + { 0x8, &IID_IShellMenu2 }, + { 0x8, &IID_IShellMenu }, + { 0xc, &IID_IWinEventHandler }, + { 0x10, &IID_IShellMenuAcc }, + } + }, + { + ID_NAME(CLSID_QuickLinks), + { + { -0xac, &IID_IDeskBand }, + { -0xac, &IID_IDockingWindow }, + { -0xac, &IID_IOleWindow }, + { -0xa8, &IID_IObjectWithSite }, + { -0xa0, &IID_IInputObject }, + { -0x9c, &IID_IPersistStream }, + { -0x9c, &IID_IPersist }, + { -0x98, &IID_IOleCommandTarget }, + { -0x94, &IID_IServiceProvider }, + { -0x78, &IID_IWinEventHandler }, + { -0x74, &IID_IShellChangeNotify }, + { -0x70, &IID_IDropTarget }, + { -0x4, &IID_IContextMenu }, + { 0x0, &IID_IShellFolderBand }, + { 0x0, &IID_IUnknown }, + { 0x94, &IID_IFolderBandPriv }, + } + }, + { + ID_NAME(CLSID_SendToMenu), + { + { -0x4, &IID_IContextMenu3 }, + { -0x4, &IID_IContextMenu2 }, + { -0x4, &IID_IContextMenu }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IOleWindow }, + } + }, + { + ID_NAME(CLSID_Shell), + { + { 0x0, &IID_IShellDispatch4 }, + { 0x0, &IID_IShellDispatch3 }, + { 0x0, &IID_IShellDispatch2 }, + { 0x0, &IID_IShellDispatch }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IObjectSafety }, + { 0x20, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_ShellDesktop), + { + { -0x8, &IID_IObjectWithSite }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IPersistFolder2 }, + { 0x8, &IID_IPersistFolder }, + { 0x8, &IID_IPersist }, + { 0xc, &IID_IShellIcon }, + { 0x14, &IID_IContextMenuCB }, + { 0x20, &IID_IOleCommandTarget }, + { FARAWY, &IID_IShellFolder2 }, + { FARAWY, &IID_IShellFolder }, + } + }, + { + ID_NAME(CLSID_ShellFSFolder), + { + { 0x0, &IID_IUnknown }, + { 0xc, &IID_IShellFolder2 }, + { 0xc, &IID_IShellFolder }, + { 0x10, &IID_IShellIcon }, + { 0x18, &IID_IPersistFolder3 }, + { 0x18, &IID_IPersistFolder2 }, + { 0x18, &IID_IPersistFolder }, + { 0x18, &IID_IPersist }, + { 0x2c, &IID_IContextMenuCB }, + { 0x34, &IID_IOleCommandTarget }, + } + }, + { + ID_NAME(CLSID_ShellFldSetExt), + { + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_ShellFolderView), + { + { 0x0, &IID_IShellFolderViewDual2 }, + { 0x0, &IID_IShellFolderViewDual }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellService }, + { 0x8, &IID_IServiceProvider }, + { 0xc, &IID_IObjectSafety }, + { 0x14, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_ShellFolderViewOC), + { + { 0x0, &IID_IFolderViewOC }, + { 0x0, &IID_IDispatch }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IObjectSafety }, + { 0x88, &IID_IPersistStreamInit }, + { 0x88, &IID_IPersist }, + { 0x90, &IID_IOleObject }, + { 0x94, &IID_IOleInPlaceActiveObject }, + { 0x98, &IID_IOleInPlaceObjectWindowless }, + { 0x98, &IID_IOleInPlaceObject }, + { 0x98, &IID_IOleWindow }, + } + }, + { + ID_NAME(CLSID_ShellItem), + { + { 0x0, &IID_IShellItem }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistIDList }, + } + }, + { + ID_NAME(CLSID_ShellLink), + { + { 0x0, &IID_IShellLinkA }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellLinkW }, + { 0x8, &IID_IPersistStream }, + { 0xc, &IID_IPersistFile }, + { 0x14, &IID_IContextMenu3 }, + { 0x14, &IID_IContextMenu2 }, + { 0x14, &IID_IContextMenu }, + { 0x18, &IID_IDropTarget }, + { 0x1c, &IID_IQueryInfo }, + { 0x24, &IID_IExtractIconA }, + { 0x28, &IID_IExtractIconW }, + { 0x2c, &IID_IExtractImage2 }, + { 0x2c, &IID_IExtractImage }, + { 0x30, &IID_IPersistPropertyBag }, + { 0x34, &IID_IServiceProvider }, + { 0x3c, &IID_IObjectWithSite }, + } + }, +#if 0 // Apparently we can only get this through Folder.Items().GetLink + { + ID_NAME(CLSID_ShellLinkObject), + { + { 0x0, &IID_IUnknown }, + } + }, +#endif + { + ID_NAME(CLSID_StartMenu), + { + { -0x48, &IID_IOleCommandTarget }, + { -0x44, &IID_IServiceProvider }, + { -0x40, &IID_IDeskBar }, + { -0x40, &IID_IOleWindow }, + { -0x3c, &IID_IInputObjectSite }, + { -0x38, &IID_IInputObject }, + { 0x0, &IID_IMenuPopup }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IObjectWithSite }, + { 0x8, &IID_IBanneredBar }, + { 0xc, &IID_IInitializeObject }, + } + }, + { + ID_NAME(CLSID_StartMenuPin), + { + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IContextMenu }, + { 0xc, &IID_IObjectWithSite }, + } + }, + { + ID_NAME(CLSID_TrackShellMenu), + { + { 0x0, &IID_ITrackShellMenu }, + { 0x0, &IID_IShellMenu }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellMenu2 }, + { 0x8, &IID_IObjectWithSite }, + { 0xc, &IID_IServiceProvider }, + } + }, +}; +static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces); + +START_TEST(shell32) +{ + TestClasses(L"shell32", ExpectedInterfaces, ExpectedInterfaceCount); +} Propchange: trunk/rostests/apitests/com/shell32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/com/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/com/testlist.c (added) +++ trunk/rostests/apitests/com/testlist.c [iso-8859-1] Sun Jul 7 09:10:31 2013 @@ -0,0 +1,21 @@ +#define WIN32_LEAN_AND_MEAN +#define __ROS_LONG64__ +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_browseui(void); +extern void func_ieframe(void); +extern void func_shdocvw(void); +extern void func_shell32(void); + +const struct test winetest_testlist[] = +{ + { "browseui", func_browseui }, + { "ieframe", func_ieframe }, + { "shdocvw", func_shdocvw }, + { "shell32", func_shell32 }, + + { 0, 0 } +}; Propchange: trunk/rostests/apitests/com/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 59441: [NDK] - Add RtlStringFromGUID
by tfaber＠svn.reactos.org 07 Jul '13

07 Jul '13

Author: tfaber Date: Sun Jul 7 07:56:46 2013 New Revision: 59441 URL: http://svn.reactos.org/svn/reactos?rev=59441&view=rev Log: [NDK] - Add RtlStringFromGUID Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Jul 7 07:56:46 2013 @@ -4112,12 +4112,22 @@ #endif #ifdef NTOS_MODE_USER +_Must_inspect_result_ NTSYSAPI NTSTATUS NTAPI RtlGUIDFromString( _In_ PUNICODE_STRING GuidString, _Out_ GUID *Guid); + +_Must_inspect_result_ +NTSYSAPI +NTSTATUS +NTAPI +RtlStringFromGUID( + _In_ REFGUID Guid, + _Out_ _At_(GuidString->Buffer, __drv_allocatesMem(Mem)) + PUNICODE_STRING GuidString); NTSYSAPI NTSTATUS

1 0

[tfaber] 59440: [PSDK] - Fix IShellFolderView too
by tfaber＠svn.reactos.org 07 Jul '13

07 Jul '13

Author: tfaber Date: Sun Jul 7 07:48:32 2013 New Revision: 59440 URL: http://svn.reactos.org/svn/reactos?rev=59440&view=rev Log: [PSDK] - Fix IShellFolderView too Modified: trunk/reactos/include/psdk/shlguid_undoc.h Modified: trunk/reactos/include/psdk/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid_undoc… ============================================================================== --- trunk/reactos/include/psdk/shlguid_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid_undoc.h [iso-8859-1] Sun Jul 7 07:48:32 2013 @@ -30,7 +30,7 @@ DEFINE_GUID(IID_IWinEventHandler, 0xEA5F2D61, 0xE008, 0x11CF, 0x99, 0xCB, 0x00, 0xC0, 0x4F, 0xD6, 0x44, 0x97); DEFINE_GUID(IID_IShellMenuAcc, 0xFAF6FE96, 0xCE5E, 0x11D1, 0x83, 0x71, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0); DEFINE_GUID(IID_IShellBrowserService, 0x1307EE17, 0xEA83, 0x49EB, 0x96, 0xB2, 0x3A, 0x28, 0xE2, 0xD7, 0x04, 0x8A); -//DEFINE_GUID(IID_IFolderView, 0xCDE725B0, 0xCCC9, 0x4519, 0x91, 0x7E, 0x32, 0x5D, 0x72, 0xFA, 0xB4, 0xCE); +DEFINE_GUID(IID_IShellFolderView, 0x37A378C0, 0xF82D, 0x11CE, 0xAE, 0x65, 0x08, 0x00, 0x2B, 0x2E, 0x12, 0x62); DEFINE_GUID(SID_SProxyBrowser, 0x20C46561, 0x8491, 0x11CF, 0x96, 0x0C, 0x00, 0x80, 0xC7, 0xF4, 0xEE, 0x85);

1 0

[tfaber] 59439: [PSDK] - Declare IID only once aka fix GCC build
by tfaber＠svn.reactos.org 07 Jul '13

07 Jul '13

Author: tfaber Date: Sun Jul 7 07:28:43 2013 New Revision: 59439 URL: http://svn.reactos.org/svn/reactos?rev=59439&view=rev Log: [PSDK] - Declare IID only once aka fix GCC build Modified: trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Sun Jul 7 07:28:43 2013 @@ -1903,7 +1903,6 @@ #define INTERFACE IShellIconOverlayIdentifier -DEFINE_GUID(IID_IShellIconOverlayIdentifier, 0x0c6c4200L, 0xc589, 0x11d0, 0x99, 0x9a, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1); DECLARE_INTERFACE_(IShellIconOverlayIdentifier, IUnknown) { STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE;

1 0

[tfaber] 59438: [PSDK] - Fix ShellItem/ShellFolderItem confusion and some misc GUIDs
by tfaber＠svn.reactos.org 07 Jul '13

07 Jul '13

Author: tfaber Date: Sun Jul 7 07:19:35 2013 New Revision: 59438 URL: http://svn.reactos.org/svn/reactos?rev=59438&view=rev Log: [PSDK] - Fix ShellItem/ShellFolderItem confusion and some misc GUIDs Modified: trunk/reactos/include/psdk/shldisp.idl trunk/reactos/include/psdk/shlguid.h trunk/reactos/include/psdk/shlguid_undoc.h trunk/reactos/include/psdk/shobjidl.idl trunk/reactos/lib/sdk/uuid/otherguids.c Modified: trunk/reactos/include/psdk/shldisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shldisp.idl?r… ============================================================================== --- trunk/reactos/include/psdk/shldisp.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shldisp.idl [iso-8859-1] Sun Jul 7 07:19:35 2013 @@ -72,7 +72,7 @@ [in] IUnknown *punkACL, [in] LPCOLESTR pwszRegKeyPath, [in] LPCOLESTR pwszQuickComplete); - + HRESULT Enable( [in] BOOL fEnable ); } @@ -308,6 +308,27 @@ HRESULT Verbs( [out, retval] FolderItemVerbs **ppfic ); HRESULT InvokeVerb( [in, optional] VARIANT vVerb ); +} + +[ + object, + uuid(edc817aa-92b8-11d1-b075-00c04fc33aa5), + oleautomation, + dual +] +interface FolderItem2 : FolderItem +{ + HRESULT InvokeVerbEx( [in, optional] VARIANT vVerb, [in, optional] VARIANT vArgs ); + + HRESULT ExtendedProperty( [in] BSTR sPropName, [out, retval] VARIANT *pvRet ); +} + +[ + uuid(2fe352ea-fd1f-11d2-b1f4-00c04f8eeb3e) +] +coclass ShellFolderItem +{ + interface FolderItem2; } /***************************************************************************** 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] Sun Jul 7 07:19:35 2013 @@ -121,6 +121,7 @@ DEFINE_GUID(IID_IDockingWindowSite, 0x2A342FC2, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); DEFINE_GUID(IID_IInputObject, 0x68284FAA, 0x6A48, 0x11D0, 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4); DEFINE_GUID(IID_IInputObjectSite, 0xF1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); +DEFINE_GUID(IID_IShellIconOverlayIdentifier, 0x0c6c4200L, 0xc589, 0x11d0, 0x99, 0x9a, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1); /**************************************************************************** * the next IID's are the namespace elements of the pidls @@ -145,8 +146,6 @@ DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); DEFINE_GUID(CLSID_ProgressDialog, 0xf8383852, 0xfcd3, 0x11d1, 0xa6, 0xb9, 0x0, 0x60, 0x97, 0xdf, 0x5b, 0xd4); - -DEFINE_GUID(CLSID_ShellItem, 0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); #define PSGUID_SHELLDETAILS {0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0} DEFINE_GUID(FMTID_ShellDetails, 0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); Modified: trunk/reactos/include/psdk/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid_undoc… ============================================================================== --- trunk/reactos/include/psdk/shlguid_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid_undoc.h [iso-8859-1] Sun Jul 7 07:19:35 2013 @@ -102,17 +102,14 @@ DEFINE_GUID(CLSID_ShellDrvDefExt, 0x5F5295E0, 0x429F, 0x1069, 0xA2, 0xE2, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); DEFINE_GUID(CLSID_ShellNetDefExt, 0x86422020, 0x42A0, 0x1069, 0xA2, 0xE5, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); -// In theory, this is documented. But until I see an SDK header that defines it, it will be treated as undocumented... -DEFINE_GUID(CLSID_ShellItem, 0x2FE352EA, 0xFD1F, 0x11D2, 0xB1, 0xF4, 0x00, 0xC0, 0x4F, 0x8E, 0xEB, 0x3E); - #define CGID_IExplorerToolbar IID_IExplorerToolbar #define SID_IExplorerToolbar IID_IExplorerToolbar #define SID_ITargetFrame2 IID_ITargetFrame2 #define SID_IWebBrowserApp IID_IWebBrowserApp #define CGID_IDeskBand IID_IDeskBand #define CGID_MenuBand CLSID_MenuBand -#define SID_STravelLogCursor IID_ITravelLogStg -#define SID_IBandSite IID_IBandSite +#define SID_STravelLogCursor IID_ITravelLogStg +#define SID_IBandSite IID_IBandSite #define SID_IFolderView IID_IFolderView #define SID_IShellBrowser IID_IShellBrowser 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] Sun Jul 7 07:19:35 2013 @@ -1765,7 +1765,7 @@ HRESULT GetExtension( [out] LPSTR pszExtension, [in] int cchExtension); -} +} /***************************************************************************** @@ -1796,7 +1796,7 @@ HRESULT GetExtension( [out] LPWSTR pszExtension, [in] int cchExtension); -} +} /***************************************************************************** * IRunnableTask interface @@ -2281,7 +2281,7 @@ ] interface IShellMenuCallback : IUnknown { - HRESULT CallbackSM( + HRESULT CallbackSM( [in, out] LPSMDATA psmd, [in] UINT uMsg, [in] WPARAM wParam, @@ -2317,48 +2317,48 @@ ] interface IShellMenu : IUnknown { - HRESULT Initialize( + HRESULT Initialize( [in] IShellMenuCallback *psmc, [in] UINT uId, [in] UINT uIdAncestor, [in] DWORD dwFlags); - - HRESULT GetMenuInfo( + + HRESULT GetMenuInfo( [out] IShellMenuCallback **ppsmc, [out] UINT *puId, [out] UINT *puIdAncestor, [out] DWORD *pdwFlags); - - HRESULT SetShellFolder( + + HRESULT SetShellFolder( [in] IShellFolder *psf, [in] LPCITEMIDLIST pidlFolder, [in] HKEY hKey, [in] DWORD dwFlags); - - HRESULT GetShellFolder( + + HRESULT GetShellFolder( [out] DWORD *pdwFlags, [out] LPITEMIDLIST *ppidl, [in] REFIID riid, [out] void **ppv); - - HRESULT SetMenu( + + HRESULT SetMenu( [in] HMENU hmenu, [in] HWND hwnd, [in] DWORD dwFlags); - - HRESULT GetMenu( + + HRESULT GetMenu( [out] HMENU *phmenu, [out] HWND *phwnd, [out] DWORD *pdwFlags); - - HRESULT InvalidateItem( + + HRESULT InvalidateItem( [in] LPSMDATA psmd, [in] DWORD dwFlags); - - HRESULT GetState( + + HRESULT GetState( [out] LPSMDATA psmd); - - HRESULT SetMenuToolbar( + + HRESULT SetMenuToolbar( [in] IUnknown *punk, [in] DWORD dwFlags); } @@ -2970,12 +2970,12 @@ ] interface ITrackShellMenu : IShellMenu { - HRESULT SetObscured( + HRESULT SetObscured( [in] HWND hwndTB, [in] IUnknown *punkBand, DWORD dwSMSetFlags); - HRESULT Popup( + HRESULT Popup( [in] HWND hwnd, [in] POINTL *ppt, [in] RECTL *prcExclude, @@ -4485,4 +4485,11 @@ coclass DestinationList { interface ICustomDestinationList; } -} + + [ + uuid(9ac9fbe1-e0a2-4ad6-b4ee-e212013ea917) + ] + coclass ShellItem { + interface IShellItem2; + } +} Modified: trunk/reactos/lib/sdk/uuid/otherguids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/otherguids.c?… ============================================================================== --- trunk/reactos/lib/sdk/uuid/otherguids.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/otherguids.c [iso-8859-1] Sun Jul 7 07:19:35 2013 @@ -29,7 +29,6 @@ DEFINE_GUID(CLSID_TF_CategoryMgr, 0xA4B544A1,0x438D,0x4B41,0x93,0x25,0x86,0x95,0x23,0xE2,0xD6,0xC7); DEFINE_GUID(CLSID_TF_LangBarMgr, 0xebb08c45,0x6c4a,0x4fdc,0xae,0x53,0x4e,0xb8,0xc4,0xc7,0xdb,0x8e); DEFINE_GUID(CLSID_TF_DisplayAttributeMgr, 0x3ce74de4,0x53d3,0x4d74,0x8b,0x83,0x43,0x1b,0x38,0x28,0xba,0x53); -DEFINE_GUID(CLSID_TaskbarList, 0x56fdf344,0xfd6d,0x11d0,0x95,0x8a,0x00,0x60,0x97,0xc9,0xa0,0x90); DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745c63,0xb2f0,0x4784,0x8b,0x67,0x5e,0x12,0xc8,0x70,0x1a,0x31); DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1,0x8355,0x426B,0xA1,0x61,0x25,0x98,0x08,0xF2,0x6B,0x14); DEFINE_GUID(GUID_TFCAT_TIP_HANDWRITING, 0x246ecb87,0xc2f2,0x4abe,0x90,0x5b,0xc8,0xb3,0x8a,0xdd,0x2c,0x43); @@ -51,6 +50,4 @@ DEFINE_GUID(CLSID_StdPicture, 0x0BE35204, 0x8F91, 0x11CE, 0x9D,0xE3, 0x00,0xAA,0x00,0x4B,0xB8,0x51); DEFINE_GUID(CLSID_StdFont, 0x0BE35203, 0x8F91, 0x11CE, 0x9D,0xE3, 0x00,0xAA,0x00,0x4B,0xB8,0x51); -DEFINE_GUID(CLSID_ShellItem, 0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); - DEFINE_GUID(SID_VariantConversion, 0x1f101481,0xbccd,0x11d0,0x93,0x36,0x00,0xa0,0xc9,0xd,0xca,0xa9);

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