Ros-diffs February 2014

ros-diffs@reactos.org

17 participants
464 discussions

[tkreuzer] 62302: [NTOSKRNL] Implement WmipFastIoDeviceControl, start implementing WmipIoControl

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 23 14:56:48 2014 New Revision: 62302 URL: http://svn.reactos.org/svn/reactos?rev=62302&view=rev Log: [NTOSKRNL] Implement WmipFastIoDeviceControl, start implementing WmipIoControl Added: branches/kernel-fun/reactos/include/reactos/wmiioctl.h - copied unchanged from r62291, branches/kernel-fun/reactos/include/reactos/wmiguid.h Removed: branches/kernel-fun/reactos/include/reactos/wmiguid.h Modified: branches/kernel-fun/reactos/ntoskrnl/wmi/wmidrv.c Removed: branches/kernel-fun/reactos/include/reactos/wmiguid.h URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/include/reac… ============================================================================== --- branches/kernel-fun/reactos/include/reactos/wmiguid.h [iso-8859-1] (original) +++ branches/kernel-fun/reactos/include/reactos/wmiguid.h (removed) @@ -1,37 +0,0 @@ - -#pragma once - -#define IOCTL_WMI_QUERY_ALL_DATA CTL_CODE(FILE_DEVICE_UNKNOWN, 0x00, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224000 -#define IOCTL_WMI_SINGLE_INSTANCE CTL_CODE(FILE_DEVICE_UNKNOWN, 0x01, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224004 -#define IOCTL_WMI_SET_SINGLE_INSTANCE CTL_CODE(FILE_DEVICE_UNKNOWN, 0x02, METHOD_BUFFERED, FILE_WRITE_ACCESS) // 0x228008 -#define IOCTL_WMI_SET_SINGLE_ITEM CTL_CODE(FILE_DEVICE_UNKNOWN, 0x03, METHOD_BUFFERED, FILE_WRITE_ACCESS) // 0x22800C -#define IOCTL_WMI_09 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x09, METHOD_BUFFERED, FILE_WRITE_ACCESS) // 0x228024 -#define IOCTL_WMI_20 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x20, METHOD_BUFFERED, FILE_ANY_ACCESS) // 0x220080 -#define IOCTL_WMI_21 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x21, METHOD_BUFFERED, FILE_ANY_ACCESS) // 0x220084 -#define IOCTL_WMI_22 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x22, METHOD_BUFFERED, FILE_ANY_ACCESS) // 0x220088 -#define IOCTL_WMI_TRACE_EVENT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x23, METHOD_NEITHER, FILE_WRITE_ACCESS) // 0x22808F -#define IOCTL_WMI_24 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x24, METHOD_BUFFERED, FILE_ANY_ACCESS) // 0x220090 -#define IOCTL_WMI_25 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x25, METHOD_BUFFERED, FILE_ANY_ACCESS) // 0x220094 -#define IOCTL_WMI_TRACE_USER_MESSAGE CTL_CODE(FILE_DEVICE_UNKNOWN, 0x28, METHOD_NEITHER, FILE_WRITE_ACCESS) // 0x2280A3 -#define IOCTL_WMI_29 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x29, METHOD_BUFFERED, FILE_ANY_ACCESS) // 0x2200A4 -#define IOCTL_WMI_2a CTL_CODE(FILE_DEVICE_UNKNOWN, 0x2a, METHOD_BUFFERED, FILE_ANY_ACCESS) // 0x2200A8 -#define IOCTL_WMI_2b CTL_CODE(FILE_DEVICE_UNKNOWN, 0x2b, METHOD_BUFFERED, FILE_ANY_ACCESS) // 0x2200AC -#define IOCTL_WMI_42 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x42, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224108 -#define IOCTL_WMI_47 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x47, METHOD_BUFFERED, FILE_WRITE_ACCESS) // 0x22811C -#define IOCTL_WMI_49 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x49, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224124 -#define IOCTL_WMI_4b CTL_CODE(FILE_DEVICE_UNKNOWN, 0x4b, METHOD_BUFFERED, FILE_WRITE_ACCESS) // 0x22812C -#define IOCTL_WMI_4c CTL_CODE(FILE_DEVICE_UNKNOWN, 0x4c, METHOD_BUFFERED, FILE_WRITE_ACCESS) // 0x228130 -#define IOCTL_WMI_4d CTL_CODE(FILE_DEVICE_UNKNOWN, 0x4d, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224134 -#define IOCTL_WMI_4e CTL_CODE(FILE_DEVICE_UNKNOWN, 0x4e, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224138 -#define IOCTL_WMI_4f CTL_CODE(FILE_DEVICE_UNKNOWN, 0x4f, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x22413C -#define IOCTL_WMI_OPEN_GUID_FOR_EVENTS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x50, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224140 -#define IOCTL_WMI_51 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x51, METHOD_BUFFERED, FILE_WRITE_ACCESS) // 0x228144 -#define IOCTL_WMI_52 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x52, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224148 -#define IOCTL_WMI_REGISTER_GUIDS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x53, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x22414C, called from ntdll!EtwpRegisterGuids -#define IOCTL_WMI_54 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x54, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224150 -#define IOCTL_WMI_55 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x55, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224154 -#define IOCTL_WMI_56 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x56, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224158 -#define IOCTL_WMI_57 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x57, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x22415C -#define IOCTL_WMI_58 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x58, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224160 -#define IOCTL_WMI_59 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x59, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224164 -#define IOCTL_WMI_5a CTL_CODE(FILE_DEVICE_UNKNOWN, 0x5a, METHOD_BUFFERED, FILE_WRITE_ACCESS) // 0x228168 Modified: branches/kernel-fun/reactos/ntoskrnl/wmi/wmidrv.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/wmi… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] Sun Feb 23 14:56:48 2014 @@ -10,10 +10,34 @@ #include <ntoskrnl.h> #include <wmistr.h> -#include <wmiguid.h> +#include <wmiioctl.h> +#include "wmip.h" #define NDEBUG #include <debug.h> + +// FIXME: these should go to a shared header +typedef struct _WMIP_REGISTER_GUIDS +{ + POBJECT_ATTRIBUTES ObjectAttributes; + ULONG Unknown04; + ULONG Unknown08; + ULONG Unknown0C; + ULONG Unknown10; + ULONG Unknown14; + + WMIREGINFOW RegInfo; +} WMIP_REGISTER_GUIDS, *PWMIP_REGISTER_GUIDS; + +typedef struct _WMIP_RESULT +{ + HANDLE Handle; + ULONG Unknown04; + ULONG Unknown08; + ULONG Unknown0C; + BOOLEAN Unknown10; +} WMIP_RESULT, *PWMIP_RESULT; + PDEVICE_OBJECT WmipServiceDeviceObject; PDEVICE_OBJECT WmipAdminDeviceObject; @@ -42,14 +66,167 @@ return STATUS_SUCCESS; } +static +NTSTATUS +WmiTraceEvent( + PVOID InputBuffer, + KPROCESSOR_MODE PreviousMode) +{ + UNIMPLEMENTED_DBGBREAK(); + return STATUS_SUCCESS; +} + +static +NTSTATUS +WmiTraceUserMessage( + PVOID InputBuffer, + ULONG InputBufferLength) +{ + UNIMPLEMENTED_DBGBREAK(); + return STATUS_SUCCESS; +} + +static +NTSTATUS +WmipRegisterGuids( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PVOID Buffer, + _In_ ULONG InputLength, + _Inout_ PULONG OutputLength) +{ + PWMIP_REGISTER_GUIDS RegisterGuids = (PWMIP_REGISTER_GUIDS)Buffer; + PWMIP_RESULT Result = (PWMIP_RESULT)Buffer; + OBJECT_ATTRIBUTES LocalObjectAttributes; + UNICODE_STRING LocalObjectName; + WCHAR LocalObjectNameBuffer[45 + 1]; + KPROCESSOR_MODE PreviousMode; + HANDLE GuidObjectHandle; + PVOID GuidObject; + NTSTATUS Status; + + /* Make sure the input buffer is large enough */ + if ((InputLength < sizeof(WMIP_REGISTER_GUIDS)) || + (RegisterGuids->RegInfo.BufferSize > + (InputLength - FIELD_OFFSET(WMIP_REGISTER_GUIDS, RegInfo)))) + { + return STATUS_UNSUCCESSFUL; + } + + /* Make sure we have a resonable GUID count */ + if ((RegisterGuids->RegInfo.GuidCount == 0) || + (RegisterGuids->RegInfo.GuidCount > 0x10000)) + { + return STATUS_UNSUCCESSFUL; + } + + _SEH2_TRY + { + /* Probe and copy the object attributes structure */ + ProbeForRead(RegisterGuids->ObjectAttributes, + sizeof(OBJECT_ATTRIBUTES), + sizeof(PVOID)); + LocalObjectAttributes = *RegisterGuids->ObjectAttributes; + + /* Probe and copy the object name UNICODE_STRING */ + ProbeForRead(LocalObjectAttributes.ObjectName, + sizeof(UNICODE_STRING), + sizeof(PVOID)); + LocalObjectName = *LocalObjectAttributes.ObjectName; + + /* Check if the object name has the expected length */ + if (LocalObjectName.Length != 45 * sizeof(WCHAR)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Probe and copy the object name buffer */ + ProbeForRead(LocalObjectName.Buffer, LocalObjectName.Length, sizeof(WCHAR)); + RtlCopyMemory(LocalObjectNameBuffer, + LocalObjectName.Buffer, + LocalObjectName.Length); + + /* Fix pointers */ + LocalObjectName.Buffer = LocalObjectNameBuffer; + LocalObjectAttributes.ObjectName = &LocalObjectName; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Got exception!\n"); + return _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* Open a new GUID object */ + PreviousMode = ExGetPreviousMode(); + Status = WmipOpenGuidObject(&LocalObjectAttributes, + SPECIFIC_RIGHTS_ALL, + PreviousMode, + &GuidObjectHandle, + &GuidObject); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Derefernce the GUID object */ + ObDereferenceObject(GuidObject); + + /* Return the handle */ + Result->Handle = GuidObjectHandle; + *OutputLength = 24; + + return STATUS_SUCCESS; +} + NTSTATUS NTAPI WmipIoControl( - _Inout_ PDEVICE_OBJECT DeviceObject, - _Inout_ PIRP Irp) -{ - UNIMPLEMENTED_DBGBREAK(); - return STATUS_NOT_IMPLEMENTED; + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION IoStackLocation; + ULONG IoControlCode; + PVOID Buffer; + ULONG InputLength, OutputLength; + NTSTATUS Status; + PAGED_CODE(); + + /* Get the current stack location */ + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + /* Get the io control parameters */ + IoControlCode = IoStackLocation->Parameters.DeviceIoControl.IoControlCode; + Buffer = Irp->AssociatedIrp.SystemBuffer; + InputLength = IoStackLocation->Parameters.DeviceIoControl.InputBufferLength; + OutputLength = IoStackLocation->Parameters.DeviceIoControl.OutputBufferLength; + + switch (IoControlCode) + { + + case IOCTL_WMI_REGISTER_GUIDS: + { + Status = WmipRegisterGuids(DeviceObject, + Buffer, + InputLength, + &OutputLength); + break; + } + + default: + DPRINT1("Unsupported yet IOCTL: 0x%lx\n", IoControlCode); + Status = STATUS_INVALID_DEVICE_REQUEST; + __debugbreak(); + break; + } + + if (Status == STATUS_PENDING) + return Status; + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = NT_SUCCESS(Status) ? OutputLength : 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } NTSTATUS @@ -87,7 +264,32 @@ _Out_ PIO_STATUS_BLOCK IoStatus, _In_ PDEVICE_OBJECT DeviceObject) { - UNIMPLEMENTED_DBGBREAK(); + PAGED_CODE(); + + if (IoControlCode == IOCTL_WMI_TRACE_EVENT) + { + if (InputBufferLength < 0x30) + { + DPRINT1("Buffer too small\n"); + return FALSE; + } + + IoStatus->Status = WmiTraceEvent(InputBuffer, ExGetPreviousMode()); + return TRUE; + } + else if (IoControlCode == IOCTL_WMI_TRACE_USER_MESSAGE) + { + if (InputBufferLength < 0x30) + { + DPRINT1("Buffer too small\n"); + return FALSE; + } + + IoStatus->Status = WmiTraceUserMessage(InputBuffer, InputBufferLength); + return TRUE; + } + + DPRINT1("Invalid io control code for fast dispatch: 0x%lx\n", IoControlCode); return FALSE; }

10 years, 6 months

[tkreuzer] 62301: [NTOSKRNK] Halfplement WmipSecurityMethod, implement WmipGUIDFromString as a wrapper around RtlGUIDFromString due to different format requirements, fix usage of RtlPrefixUnicodeSt...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 23 14:22:32 2014 New Revision: 62301 URL: http://svn.reactos.org/svn/reactos?rev=62301&view=rev Log: [NTOSKRNK] Halfplement WmipSecurityMethod, implement WmipGUIDFromString as a wrapper around RtlGUIDFromString due to different format requirements, fix usage of RtlPrefixUnicodeString. Modified: branches/kernel-fun/reactos/ntoskrnl/wmi/guidobj.c branches/kernel-fun/reactos/ntoskrnl/wmi/wmip.h Modified: branches/kernel-fun/reactos/ntoskrnl/wmi/guidobj.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/wmi… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/wmi/guidobj.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/wmi/guidobj.c [iso-8859-1] Sun Feb 23 14:22:32 2014 @@ -10,7 +10,6 @@ #include <ntoskrnl.h> #include <wmistr.h> -#include <wmiguid.h> #include "wmip.h" #define NDEBUG @@ -37,8 +36,43 @@ _In_ POOL_TYPE PoolType, _In_ PGENERIC_MAPPING GenericMapping) { - UNIMPLEMENTED_DBGBREAK(); - return STATUS_NOT_IMPLEMENTED; + PAGED_CODE(); + + ASSERT((PoolType == PagedPool) || (PoolType == NonPagedPool)); + ASSERT((OperationType == QuerySecurityDescriptor) || + (OperationType == SetSecurityDescriptor) || + (OperationType == AssignSecurityDescriptor) || + (OperationType == DeleteSecurityDescriptor)); + + if (OperationType == QuerySecurityDescriptor) + { + return ObQuerySecurityDescriptorInfo(Object, + SecurityInformation, + SecurityDescriptor, + CapturedLength, + ObjectSecurityDescriptor); + } + else if (OperationType == SetSecurityDescriptor) + { + return ObSetSecurityDescriptorInfo(Object, + SecurityInformation, + SecurityDescriptor, + ObjectSecurityDescriptor, + PoolType, + GenericMapping); + } + else if (OperationType == AssignSecurityDescriptor) + { + ObAssignObjectSecurityDescriptor(Object, SecurityDescriptor, PoolType); + return STATUS_SUCCESS; + } + else if (OperationType == DeleteSecurityDescriptor) + { + return ObDeassignSecurity(ObjectSecurityDescriptor); + } + + ASSERT(FALSE); + return STATUS_INVALID_PARAMETER; } VOID @@ -99,6 +133,32 @@ static NTSTATUS +WmipGUIDFromString( + _In_ PUNICODE_STRING GuidString, + _Out_ PGUID Guid) +{ + WCHAR Buffer[GUID_STRING_LENGTH + 2]; + UNICODE_STRING String; + + /* Validate string length */ + if (GuidString->Length != GUID_STRING_LENGTH * sizeof(WCHAR)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Copy the string and wrap it in {} */ + RtlCopyMemory(&Buffer[1], GuidString->Buffer, GuidString->Length); + Buffer[0] = L'{'; + Buffer[GUID_STRING_LENGTH + 1] = L'}'; + + String.Buffer = Buffer; + String.Length = String.MaximumLength = sizeof(Buffer); + + return RtlGUIDFromString(&String, Guid); +} + +static +NTSTATUS WmipCreateGuidObject( _In_ PUNICODE_STRING GuidString, _Out_ PWMIP_GUID_OBJECT *OutGuidObject) @@ -109,7 +169,7 @@ NTSTATUS Status; /* Convert the string into a GUID structure */ - Status = RtlGUIDFromString(GuidString, &Guid); + Status = WmipGUIDFromString(GuidString, &Guid); if (!NT_SUCCESS(Status)) { DPRINT1("WMI: Invalid uuid format for guid '%wZ'\n", GuidString); @@ -163,7 +223,7 @@ PAGED_CODE(); /* Check if we have the expected prefix */ - if (!RtlPrefixUnicodeString(ObjectAttributes->ObjectName, &Prefix, FALSE)) + if (!RtlPrefixUnicodeString(&Prefix, ObjectAttributes->ObjectName, FALSE)) { DPRINT1("WMI: Invalid prefix for guid object '%wZ'\n", ObjectAttributes->ObjectName); Modified: branches/kernel-fun/reactos/ntoskrnl/wmi/wmip.h URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/wmi… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/wmi/wmip.h [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/wmi/wmip.h [iso-8859-1] Sun Feb 23 14:22:32 2014 @@ -1,5 +1,7 @@ #pragma once + +#define GUID_STRING_LENGTH 36 typedef struct _WMIP_GUID_OBJECT {

10 years, 6 months

[akhaldi] 62300: [CMAKE] * Add a workaround for the recent MSVC toolchain (MSBUILD) /MP bug.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 23 12:25:36 2014 New Revision: 62300 URL: http://svn.reactos.org/svn/reactos?rev=62300&view=rev Log: [CMAKE] * Add a workaround for the recent MSVC toolchain (MSBUILD) /MP bug. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=62300… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Feb 23 12:25:36 2014 @@ -121,7 +121,14 @@ if(PCH) macro(add_pch _target _pch _sources) - set(_gch ${CMAKE_CURRENT_BINARY_DIR}/${_target}.pch) + + # Workaround for the MSVC toolchain (MSBUILD) /MP bug + set(_temp_gch ${CMAKE_CURRENT_BINARY_DIR}/${_target}.pch) + if(MSVC_IDE) + file(TO_NATIVE_PATH ${_temp_gch} _gch) + else() + set(_gch ${_temp_gch}) + endif() if(IS_CPP) set(_pch_language CXX)

10 years, 6 months

[hbelusca] 62299: [MSGINA]: Addendum for r62065 . I don't like freeing this 'msg' object in many places (in the caller and in the thread).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Feb 23 11:41:56 2014 New Revision: 62299 URL: http://svn.reactos.org/svn/reactos?rev=62299&view=rev Log: [MSGINA]: Addendum for r62065 . I don't like freeing this 'msg' object in many places (in the caller and in the thread). Modified: trunk/reactos/dll/win32/msgina/gui.c Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sun Feb 23 11:41:56 2014 @@ -145,10 +145,20 @@ &ThreadId); if (Thread) { + /* 'msg' will be freed by 'StartupWindowThread' */ + CloseHandle(Thread); WaitForSingleObject(msg->StartupEvent, INFINITE); CloseHandle(msg->StartupEvent); return TRUE; + } + else + { + /* + * The 'StartupWindowThread' thread couldn't be created, + * so we need to free the allocated 'msg'. + */ + HeapFree(GetProcessHeap(), 0, msg); } return FALSE;

10 years, 6 months

[akhaldi] 62298: [CMAKE] * Use the appropriate CMake command to get the absolute path. I forgot to commit this change in the transition phase. CORE-7918 #resolve #comment Should be fixed in r62298....

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 23 10:37:31 2014 New Revision: 62298 URL: http://svn.reactos.org/svn/reactos?rev=62298&view=rev Log: [CMAKE] * Use the appropriate CMake command to get the absolute path. I forgot to commit this change in the transition phase. CORE-7918 #resolve #comment Should be fixed in r62298. Thank you for testing the VS build. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=62298… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Feb 23 10:37:31 2014 @@ -343,9 +343,9 @@ get_directory_property(_defines COMPILE_DEFINITIONS) foreach(_source_file ${ARGN}) get_filename_component(_source_file_base_name ${_source_file} NAME_WE) + get_filename_component(_source_file_full_path ${_source_file} ABSOLUTE) set(_preprocessed_asm_file ${CMAKE_CURRENT_BINARY_DIR}/asm/${_source_file_base_name}_${_target}.tmp) set(_object_file ${CMAKE_CURRENT_BINARY_DIR}/asm/${_source_file_base_name}_${_target}.obj) - set(_source_file_full_path ${CMAKE_CURRENT_SOURCE_DIR}/${_source_file}) get_source_file_property(_defines_semicolon_list ${_source_file_full_path} COMPILE_DEFINITIONS) unset(_source_file_defines) foreach(_define ${_defines_semicolon_list})

10 years, 6 months

[ekohl] 62297: [MSGINA] Shutdown dialog: Display the current users name in the "log off" list entry.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 23 09:32:44 2014 New Revision: 62297 URL: http://svn.reactos.org/svn/reactos?rev=62297&view=rev Log: [MSGINA] Shutdown dialog: Display the current users name in the "log off" list entry. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/en-US.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/he-IL.rc trunk/reactos/dll/win32/msgina/lang/id-ID.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/lang/sq-AL.rc trunk/reactos/dll/win32/msgina/lang/tr-TR.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -641,6 +641,7 @@ IN PGINA_CONTEXT pgContext) { WCHAR szBuffer[256]; + WCHAR szBuffer2[256]; HWND hwndList; INT idx, count, i; @@ -651,7 +652,8 @@ /* Log off */ LoadStringW(hDllInstance, IDS_SHUTDOWN_LOGOFF, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); - idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); + wsprintfW(szBuffer2, szBuffer, pgContext->UserName); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer2); if (idx != CB_ERR) SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_LOGOFF); Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -155,14 +155,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -150,15 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ - + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -152,14 +152,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: trunk/reactos/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -149,14 +149,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -158,14 +158,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -159,14 +159,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -152,14 +152,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -152,14 +152,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -155,14 +155,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: trunk/reactos/dll/win32/msgina/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sq-A… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -150,14 +150,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: trunk/reactos/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -152,14 +152,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Sun Feb 23 09:32:44 2014 @@ -158,14 +158,14 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN + IDS_SHUTDOWN_LOGOFF "Log off ""%s""" IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_LOGOFF "Log off" IDS_SHUTDOWN_RESTART "Restart" IDS_SHUTDOWN_SLEEP "Sleep" IDS_SHUTDOWN_HIBERNATE "Hibernate" /* Shut down descriptions */ + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer."

10 years, 6 months

[dquintana] 62296: [RSHELL] * CMenuDeskBar: Actually use the Popup flags to decide on the relative position of the submenus. CORE-7886

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Feb 23 00:15:27 2014 New Revision: 62296 URL: http://svn.reactos.org/svn/reactos?rev=62296&view=rev Log: [RSHELL] * CMenuDeskBar: Actually use the Popup flags to decide on the relative position of the submenus. CORE-7886 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Sun Feb 23 00:15:27 2014 @@ -727,7 +727,7 @@ ClientToScreen(m_hwnd, &a); ClientToScreen(m_hwnd, &b); - POINTL pt = { b.x, b.y }; + POINTL pt = { b.x, a.y }; RECTL rcl = { a.x, a.y, b.x, b.y }; // maybe-TODO: fetch client area of deskbar? @@ -1580,6 +1580,8 @@ pdbi->dwMask = DBIM_MINSIZE | DBIM_MAXSIZE | DBIM_INTEGRAL | DBIM_ACTUAL | DBIM_TITLE | DBIM_MODEFLAGS | DBIM_BKCOLOR; } +#define MIN_WIDTH 220 + if (pdbi->dwMask & DBIM_MINSIZE) { SIZE sizeStatic = { 0 }; @@ -1588,7 +1590,7 @@ if (hwndStatic) SendMessageW(hwndStatic, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeStatic)); if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETIDEALSIZE, TRUE, reinterpret_cast<LPARAM>(&sizeShlFld)); - pdbi->ptMinSize.x = 0; + pdbi->ptMinSize.x = MIN_WIDTH; pdbi->ptMinSize.y = sizeStatic.cy + sizeShlFld.cy; } if (pdbi->dwMask & DBIM_MAXSIZE) @@ -1599,10 +1601,7 @@ if (hwndStatic) SendMessageW(hwndStatic, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&sizeStatic)); if (hwndShlFld) SendMessageW(hwndShlFld, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&sizeShlFld)); - sizeStatic.cx += 64; - sizeShlFld.cx += 64; - - pdbi->ptMaxSize.x = max(sizeStatic.cx, sizeShlFld.cx); // ignored + pdbi->ptMaxSize.x = max(MIN_WIDTH, max(sizeStatic.cx, sizeShlFld.cx)); // ignored pdbi->ptMaxSize.y = sizeStatic.cy + sizeShlFld.cy; } if (pdbi->dwMask & DBIM_INTEGRAL) @@ -2242,7 +2241,7 @@ if (popup) { IUnknown_SetSite(popup, m_subMenuParent); - popup->Popup(pAt, pExclude, MPPF_TOP | MPPF_RIGHT); - } - return S_OK; -} + popup->Popup(pAt, pExclude, MPPF_RIGHT); + } + return S_OK; +} Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Sun Feb 23 00:15:27 2014 @@ -399,8 +399,6 @@ return hr; ::AdjustWindowRect(&rc, ::GetWindowLong(m_hWnd, GWL_STYLE), FALSE); - rc.right -= rc.left; - rc.bottom -= rc.top; if (m_Banner != NULL) { @@ -409,15 +407,35 @@ rc.right += bm.bmWidth; } - int x = ppt->x; - int y = ppt->y - rc.bottom; - int cx = rc.right; - int cy = rc.bottom; + int x, y, cx, cy; RECT rcWorkArea; SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea, 0); - int waHeight = rcWorkArea.bottom - rcWorkArea.top; + + switch (dwFlags & MPPF_POS_MASK) + { + case MPPF_LEFT: + case MPPF_TOP: + x = ppt->x - rc.right; + cx = rc.right - rc.left; + break; + default: + x = ppt->x; + cx = rc.right - rc.left; + break; + } + + if (dwFlags & MPPF_BOTTOM) + { + y = ppt->y - rc.bottom; + cy = rc.bottom - rc.top; + } + else + { + y = ppt->y + rc.top; + cy = rc.bottom - rc.top; + } if (y < rcWorkArea.top) {

10 years, 6 months

[dquintana] 62295: [RSHELL] * Take "DbgPrint" function from explorer-new. * CMenuBand: Show placeholder if the band gets an empty IShellFolder. Added what I guess is a hack, to allow CMenuDeskBar t...

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Feb 22 22:59:28 2014 New Revision: 62295 URL: http://svn.reactos.org/svn/reactos?rev=62295&view=rev Log: [RSHELL] * Take "DbgPrint" function from explorer-new. * CMenuBand: Show placeholder if the band gets an empty IShellFolder. Added what I guess is a hack, to allow CMenuDeskBar to get the submenu popup from the band. * CMenuDeskBar: Use WM_ACTIVATE and WM_ACTIVATEAPP to detect when the menu should be closed. Uses the hack above for the exception of showing a submenu. CORE-7886 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/precomp.h Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Sat Feb 22 22:59:28 2014 @@ -332,6 +332,11 @@ } private: + CMenuBand * m_currentBand; + HWND m_currentFocus; + HHOOK m_hHook; + DWORD m_threadId; + // TODO: make dynamic #define MAX_RECURSE 20 CMenuBand* m_bandStack[MAX_RECURSE]; @@ -399,23 +404,16 @@ BEGIN_COM_MAP(CMenuFocusManager) END_COM_MAP() -private: - CMenuBand * m_currentBand; - HWND m_currentFocus; - HHOOK m_hHook; - DWORD m_threadId; - LRESULT GetMsgHook(INT nCode, WPARAM wParam, LPARAM lParam) { if (nCode < 0) return CallNextHookEx(m_hHook, nCode, wParam, lParam); - BOOL callNext = TRUE; - BOOL fRemoved = wParam; - MSG* msg = reinterpret_cast<MSG*>(lParam); - if (nCode == HC_ACTION) { + BOOL callNext = TRUE; + MSG* msg = reinterpret_cast<MSG*>(lParam); + // Do whatever is necessary here switch (msg->message) @@ -452,9 +450,6 @@ // PostMessage(m_currentFocus, WM_SYSCHAR, wParam, lParam); //} break; - case WM_ACTIVATE: - break; - } if (!callNext) @@ -481,24 +476,26 @@ HRESULT UpdateFocus(CMenuBand * newBand) { HRESULT hr; - - hr = RemoveHooks(m_currentFocus); - - if (FAILED(hr) || !newBand) - { + HWND newFocus; + + if (newBand == NULL) + { + hr = RemoveHooks(m_currentFocus); m_currentFocus = NULL; m_currentBand = NULL; return S_OK; } - HWND newFocus; hr = newBand->_GetTopLevelWindow(&newFocus); if (FAILED(hr)) return hr; - hr = PlaceHooks(m_currentFocus); - if (FAILED(hr)) - return hr; + if (!m_currentBand) + { + hr = PlaceHooks(newFocus); + if (FAILED(hr)) + return hr; + } m_currentFocus = newFocus; m_currentBand = newBand; @@ -1147,6 +1144,22 @@ } CoTaskMemFree(item); + // If no items were added, show the "empty" placeholder + if (i == 0) + { + TBBUTTON tbb = { 0 }; + PWSTR MenuString = L"(Empty)"; + + tbb.fsState = 0/*TBSTATE_DISABLED*/; + tbb.fsStyle = 0; + tbb.iString = (INT_PTR) MenuString; + tbb.iBitmap = -1; + + SendMessageW(m_hwnd, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb)); + + return S_OK; + } + return hr; } @@ -1829,7 +1842,15 @@ HRESULT STDMETHODCALLTYPE CMenuBand::GetClient(IUnknown **ppunkClient) { - UNIMPLEMENTED; + // HACK, so I can test for a submenu in the DeskBar + //UNIMPLEMENTED; + if (ppunkClient) + { + if (m_subMenuChild) + *ppunkClient = m_subMenuChild; + else + *ppunkClient = NULL; + } return S_OK; } @@ -2209,7 +2230,6 @@ return S_OK; } - HRESULT CMenuBand::_OnPopupSubMenu(IMenuPopup * popup, POINTL * pAt, RECTL * pExclude) { if (m_subMenuChild) Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Sat Feb 22 22:59:28 2014 @@ -56,6 +56,8 @@ INT m_Level; + BOOL m_Shown; + public: CMenuDeskBar(); ~CMenuDeskBar(); @@ -68,8 +70,9 @@ BEGIN_MSG_MAP(CMenuDeskBar) MESSAGE_HANDLER(WM_SIZE, _OnSize) MESSAGE_HANDLER(WM_NOTIFY, _OnNotify) - MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, _OnWindowPosChanged) MESSAGE_HANDLER(WM_PAINT, _OnPaint) + MESSAGE_HANDLER(WM_ACTIVATE, _OnActivate) + MESSAGE_HANDLER(WM_ACTIVATEAPP, _OnAppActivate) END_MSG_MAP() BEGIN_COM_MAP(CMenuDeskBar) @@ -131,9 +134,11 @@ // message handlers LRESULT _OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT _OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT _OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT _OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - + LRESULT _OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT _OnAppActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + + BOOL _IsSubMenuParent(HWND hwnd); HRESULT _CloseBar(); }; @@ -160,13 +165,19 @@ CMenuDeskBar::CMenuDeskBar() : m_Client(NULL), m_Banner(NULL), - m_Level(deskBarCount++) + m_Level(deskBarCount++), + m_Shown(FALSE) { } CMenuDeskBar::~CMenuDeskBar() { deskBarCount--; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::Initialize(THIS) +{ + return S_OK; } HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetWindow(HWND *lphwnd) @@ -320,12 +331,16 @@ { if (prc == NULL) return E_POINTER; + return S_OK; } HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSite(IUnknown *pUnkSite) { // Windows closes the bar if this is called when the bar is shown + + if (m_Shown) + _CloseBar(); m_Site = pUnkSite; @@ -340,88 +355,6 @@ return E_FAIL; return m_Site->QueryInterface(riid, ppvSite); -} - -LRESULT CMenuDeskBar::_OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - if (m_Client) - { - RECT rc; - - GetClientRect(&rc); - - if (m_Banner != NULL) - { - BITMAP bm; - ::GetObject(m_Banner, sizeof(bm), &bm); - rc.left += bm.bmWidth; - } - - ::SetWindowPos(m_ClientWindow, NULL, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, 0); - } - - return 0; -} - -LRESULT CMenuDeskBar::_OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - CComPtr<IWinEventHandler> winEventHandler; - LRESULT result; - HRESULT hr; - - result = 0; - if (m_Client.p != NULL) - { - hr = m_Client->QueryInterface(IID_PPV_ARG(IWinEventHandler, &winEventHandler)); - if (SUCCEEDED(hr) && winEventHandler.p != NULL) - hr = winEventHandler->OnWinEvent(NULL, uMsg, wParam, lParam, &result); - } - return result; -} - -LRESULT CMenuDeskBar::_OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - return 0; -} - -LRESULT CMenuDeskBar::_OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - bHandled = FALSE; - - if (m_Banner && !m_IconSize) - { - BITMAP bm; - PAINTSTRUCT ps; - HDC hdc = BeginPaint(&ps); - - HDC hdcMem = ::CreateCompatibleDC(hdc); - HGDIOBJ hbmOld = ::SelectObject(hdcMem, m_Banner); - - ::GetObject(m_Banner, sizeof(bm), &bm); - - RECT rc; - if (!GetClientRect(&rc)) - WARN("GetClientRect failed\n"); - - const int bx = bm.bmWidth; - const int by = bm.bmHeight; - const int cy = rc.bottom; - - TRACE("Painting banner: %d by %d\n", bm.bmWidth, bm.bmHeight); - - if (!::StretchBlt(hdc, 0, 0, bx, cy - by, hdcMem, 0, 0, bx, 1, SRCCOPY)) - WARN("StretchBlt failed\n"); - - if (!::BitBlt(hdc, 0, cy - by, bx, by, hdcMem, 0, 0, SRCCOPY)) - WARN("BitBlt failed\n"); - - ::SelectObject(hdcMem, hbmOld); - ::DeleteDC(hdcMem); - - EndPaint(&ps); - } - - return TRUE; } HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags) @@ -502,6 +435,8 @@ this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, SWP_SHOWWINDOW); + m_Shown = true; + // HACK: The bar needs to be notified of the size AFTER it is shown. // Quick & dirty way of getting it done. BOOL bHandled; @@ -509,6 +444,7 @@ UIActivateIO(TRUE, NULL); + return S_OK; } @@ -555,78 +491,9 @@ return S_OK; } -HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect( - DWORD dwSelectType) -{ - /* As far as I can tell, the submenu hierarchy looks like this: - - The DeskBar's Child is the Band it contains. - The DeskBar's Parent is the SID_SMenuPopup of the Site. - - The Band's Child is the IMenuPopup of the child submenu. - The Band's Parent is the SID_SMenuPopup of the Site (the DeskBar). - - When the DeskBar receives a selection event: - If it requires closing the window, it will notify the Child (Band) using CancelLevel. - If it has to spread upwards (everything but CancelLevel), it will notify the Parent. - - When the Band receives a selection event, this is where it gets fuzzy: - In which cases does it call the Parent? Probably not CancelLevel. - In which cases does it call the Child? - How does it react to calls? - - */ - - switch (dwSelectType) - { - case MPOS_EXECUTE: - case MPOS_FULLCANCEL: - case MPOS_CANCELLEVEL: - - _CloseBar(); - - if (dwSelectType == MPOS_CANCELLEVEL) - return S_OK; - - case MPOS_SELECTLEFT: - case MPOS_SELECTRIGHT: - case MPOS_CHILDTRACKING: - if (m_SubMenuParent) - return m_SubMenuParent->OnSelect(dwSelectType); - break; - } - - return S_OK; -} - -HRESULT CMenuDeskBar::_CloseBar() -{ - CComPtr<IDeskBarClient> dbc; - HRESULT hr; - - if (m_SubMenuChild) - { - hr = m_SubMenuChild->OnSelect(MPOS_CANCELLEVEL); - if (FAILED(hr)) - return hr; - } - - hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc)); - if (FAILED(hr)) - return hr; - - hr = dbc->UIActivateDBC(FALSE); - if (FAILED(hr)) - return hr; - - SetWindowPos(m_hWnd, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); - - return UIActivateIO(FALSE, NULL); -} - HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSubMenu(IMenuPopup *pmp, BOOL fSet) { - // Called by the CHILD to notify the parent of the submenu object + // Called by the MenuBand to assign itself as the logical child of the DeskBar if (fSet) { @@ -645,8 +512,220 @@ return S_OK; } - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::Initialize(THIS) -{ - return S_OK; -} +HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect(DWORD dwSelectType) +{ + /* As far as I can tell, the submenu hierarchy looks like this: + + The DeskBar's Child is the Band it contains. + The DeskBar's Parent is the SID_SMenuPopup of the Site. + + The Band's Child is the IMenuPopup of the child submenu. + The Band's Parent is the SID_SMenuPopup of the Site (the DeskBar). + + When the DeskBar receives a selection event: + If it requires closing the window, it will notify the Child (Band) using CancelLevel. + If it has to spread upwards (everything but CancelLevel), it will notify the Parent. + + When the Band receives a selection event, this is where it gets fuzzy: + In which cases does it call the Parent? Probably not CancelLevel. + In which cases does it call the Child? + How does it react to calls? + + */ + + switch (dwSelectType) + { + case MPOS_EXECUTE: + case MPOS_FULLCANCEL: + case MPOS_CANCELLEVEL: + + _CloseBar(); + + if (dwSelectType == MPOS_CANCELLEVEL) + return S_OK; + + case MPOS_SELECTLEFT: + case MPOS_SELECTRIGHT: + case MPOS_CHILDTRACKING: + if (m_SubMenuParent) + return m_SubMenuParent->OnSelect(dwSelectType); + break; + } + + return S_OK; +} + +HRESULT CMenuDeskBar::_CloseBar() +{ + CComPtr<IDeskBarClient> dbc; + HRESULT hr; + + m_Shown = false; + + if (m_SubMenuChild) + { + hr = m_SubMenuChild->OnSelect(MPOS_CANCELLEVEL); + if (FAILED(hr)) + return hr; + } + + hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc)); + if (FAILED(hr)) + return hr; + + hr = dbc->UIActivateDBC(FALSE); + if (FAILED(hr)) + return hr; + + SetWindowPos(m_hWnd, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); + + return UIActivateIO(FALSE, NULL); +} + +BOOL CMenuDeskBar::_IsSubMenuParent(HWND hwnd) +{ + CComPtr<IMenuPopup> popup = m_SubMenuParent; + + while (popup) + { + HRESULT hr; + CComPtr<IOleWindow> window; + + hr = popup->QueryInterface(IID_PPV_ARG(IOleWindow, &window)); + if (FAILED(hr)) + return FALSE; + + HWND parent; + + hr = window->GetWindow(&parent); + if (SUCCEEDED(hr) && hwnd == parent) + return TRUE; + + popup = NULL; + hr = IUnknown_GetSite(window, IID_PPV_ARG(IMenuPopup, &popup)); + if (FAILED(hr)) + return FALSE; + } + + return FALSE; +} + +LRESULT CMenuDeskBar::_OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + if (m_Client) + { + RECT rc; + + GetClientRect(&rc); + + if (m_Banner != NULL) + { + BITMAP bm; + ::GetObject(m_Banner, sizeof(bm), &bm); + rc.left += bm.bmWidth; + } + + ::SetWindowPos(m_ClientWindow, NULL, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, 0); + } + + return 0; +} + +LRESULT CMenuDeskBar::_OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + if (!m_Client) + return 0; + + CComPtr<IWinEventHandler> winEventHandler; + HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IWinEventHandler, &winEventHandler)); + if (FAILED(hr)) + return 0; + + if (winEventHandler) + { + LRESULT result; + hr = winEventHandler->OnWinEvent(NULL, uMsg, wParam, lParam, &result); + if (FAILED(hr)) + return 0; + return result; + } + + return 0; +} + +LRESULT CMenuDeskBar::_OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + bHandled = FALSE; + + if (m_Banner && !m_IconSize) + { + BITMAP bm; + PAINTSTRUCT ps; + HDC hdc = BeginPaint(&ps); + + HDC hdcMem = ::CreateCompatibleDC(hdc); + HGDIOBJ hbmOld = ::SelectObject(hdcMem, m_Banner); + + ::GetObject(m_Banner, sizeof(bm), &bm); + + RECT rc; + if (!GetClientRect(&rc)) + WARN("GetClientRect failed\n"); + + const int bx = bm.bmWidth; + const int by = bm.bmHeight; + const int cy = rc.bottom; + + TRACE("Painting banner: %d by %d\n", bm.bmWidth, bm.bmHeight); + + if (!::StretchBlt(hdc, 0, 0, bx, cy - by, hdcMem, 0, 0, bx, 1, SRCCOPY)) + WARN("StretchBlt failed\n"); + + if (!::BitBlt(hdc, 0, cy - by, bx, by, hdcMem, 0, 0, SRCCOPY)) + WARN("BitBlt failed\n"); + + ::SelectObject(hdcMem, hbmOld); + ::DeleteDC(hdcMem); + + EndPaint(&ps); + } + + return TRUE; +} + +LRESULT CMenuDeskBar::_OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + if (wParam != 0) + return 0; + + // HACK! I just want it to work !!! + CComPtr<IDeskBar> db; + HRESULT hr = IUnknown_QueryService(m_Client, SID_SMenuBandChild, IID_PPV_ARG(IDeskBar, &db)); + if (FAILED(hr)) + return 0; + + CComPtr<IUnknown> punk; + + hr = db->GetClient(&punk); + if (FAILED(hr)) + return 0; + + if (!punk && m_Shown) + { + if (!_IsSubMenuParent(reinterpret_cast<HWND>(lParam))) + { + OnSelect(MPOS_FULLCANCEL); + } + } + + return 0; +} + +LRESULT CMenuDeskBar::_OnAppActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + if (wParam == 0) + { + OnSelect(MPOS_FULLCANCEL); + } + return 0; +} Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Sat Feb 22 22:59:28 2014 @@ -3,9 +3,9 @@ #define USE_SYSTEM_MENUSITE 0 #define USE_SYSTEM_MENUBAND 0 -#define WRAP_MENUDESKBAR 1 -#define WRAP_MENUSITE 1 -#define WRAP_MENUBAND 1 +#define WRAP_MENUDESKBAR 0 +#define WRAP_MENUSITE 0 +#define WRAP_MENUBAND 0 #include <stdio.h> #include <tchar.h> @@ -44,3 +44,39 @@ extern "C" HRESULT CMenuDeskBar_Wrapper(IDeskBar * db, REFIID riid, LPVOID *ppv); extern "C" HRESULT CMenuSite_Wrapper(IBandSite * bs, REFIID riid, LPVOID *ppv); extern "C" HRESULT CMenuBand_Wrapper(IShellMenu * sm, REFIID riid, LPVOID *ppv); + +static __inline ULONG +Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) +{ + char szMsg[512]; + char *szMsgStart; + const char *fname; + va_list vl; + ULONG uRet; + + fname = strrchr(filename, '\\'); + if (fname == NULL) + { + fname = strrchr(filename, '/'); + if (fname != NULL) + fname++; + } + else + fname++; + + if (fname == NULL) + fname = filename; + + szMsgStart = szMsg + sprintf(szMsg, "%s:%d: ", fname, line); + + va_start(vl, lpFormat); + uRet = (ULONG) vsprintf(szMsgStart, lpFormat, vl); + va_end(vl); + + OutputDebugStringA(szMsg); + + return uRet; +} + +#define DbgPrint(fmt, ...) \ + Win32DbgPrint(__FILE__, __LINE__, fmt, ##__VA_ARGS__)

10 years, 6 months

[tkreuzer] 62294: [NTOSKRNL] Add basic code for the WMI GUID object

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 22 20:07:10 2014 New Revision: 62294 URL: http://svn.reactos.org/svn/reactos?rev=62294&view=rev Log: [NTOSKRNL] Add basic code for the WMI GUID object Added: branches/kernel-fun/reactos/ntoskrnl/wmi/guidobj.c (with props) Modified: branches/kernel-fun/reactos/ntoskrnl/ntos.cmake branches/kernel-fun/reactos/ntoskrnl/wmi/wmi.c branches/kernel-fun/reactos/ntoskrnl/wmi/wmip.h Modified: branches/kernel-fun/reactos/ntoskrnl/ntos.cmake URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/nto… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/ntos.cmake [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/ntos.cmake [iso-8859-1] Sat Feb 22 20:07:10 2014 @@ -270,6 +270,7 @@ ${REACTOS_SOURCE_DIR}/ntoskrnl/se/srm.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/token.c ${REACTOS_SOURCE_DIR}/ntoskrnl/vf/driver.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/guidobj.c ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/wmi.c ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/wmidrv.c) Added: branches/kernel-fun/reactos/ntoskrnl/wmi/guidobj.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/wmi… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/wmi/guidobj.c (added) +++ branches/kernel-fun/reactos/ntoskrnl/wmi/guidobj.c [iso-8859-1] Sat Feb 22 20:07:10 2014 @@ -0,0 +1,207 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/io/wmidrv.c + * PURPOSE: I/O Windows Management Instrumentation (WMI) Support + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#include <wmistr.h> +#include <wmiguid.h> +#include "wmip.h" + +#define NDEBUG +#include <debug.h> + + +/* GLOBALS ******************************************************************/ + +POBJECT_TYPE WmipGuidObjectType; +GENERIC_MAPPING WmipGenericMapping; + + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +WmipSecurityMethod( + _In_ PVOID Object, + _In_ SECURITY_OPERATION_CODE OperationType, + _In_ PSECURITY_INFORMATION SecurityInformation, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Inout_ PULONG CapturedLength, + _Inout_ PSECURITY_DESCRIPTOR *ObjectSecurityDescriptor, + _In_ POOL_TYPE PoolType, + _In_ PGENERIC_MAPPING GenericMapping) +{ + UNIMPLEMENTED_DBGBREAK(); + return STATUS_NOT_IMPLEMENTED; +} + +VOID +NTAPI +WmipDeleteMethod( + _In_ PVOID Object) +{ + UNIMPLEMENTED_DBGBREAK(); +} + +VOID +NTAPI +WmipCloseMethod( + _In_opt_ PEPROCESS Process, + _In_ PVOID Object, + _In_ ACCESS_MASK GrantedAccess, + _In_ ULONG ProcessHandleCount, + _In_ ULONG SystemHandleCount) +{ + UNIMPLEMENTED_DBGBREAK(); +} + +NTSTATUS +NTAPI +WmipInitializeGuidObjectType( + VOID) +{ + static UNICODE_STRING GuidObjectName = RTL_CONSTANT_STRING(L"WmiGuid"); + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + NTSTATUS Status; + + /* Setup the object type initializer */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; + ObjectTypeInitializer.GenericMapping = WmipGenericMapping; + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.MaintainHandleCount = FALSE; + ObjectTypeInitializer.ValidAccessMask = STANDARD_RIGHTS_ALL | 0xFFF; + ObjectTypeInitializer.SecurityRequired = TRUE; + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(WMIP_GUID_OBJECT);; + ObjectTypeInitializer.SecurityProcedure = WmipSecurityMethod; + ObjectTypeInitializer.DeleteProcedure = WmipDeleteMethod; + ObjectTypeInitializer.CloseProcedure = WmipCloseMethod; + + /* Create the object type */ + Status = ObCreateObjectType(&GuidObjectName, + &ObjectTypeInitializer, + 0, + &WmipGuidObjectType); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ObCreateObjectType failed: 0x%lx\n", Status); + } + + return Status; +} + +static +NTSTATUS +WmipCreateGuidObject( + _In_ PUNICODE_STRING GuidString, + _Out_ PWMIP_GUID_OBJECT *OutGuidObject) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + GUID Guid; + PWMIP_GUID_OBJECT GuidObject; + NTSTATUS Status; + + /* Convert the string into a GUID structure */ + Status = RtlGUIDFromString(GuidString, &Guid); + if (!NT_SUCCESS(Status)) + { + DPRINT1("WMI: Invalid uuid format for guid '%wZ'\n", GuidString); + return Status; + } + + /* Initialize object attributes for an unnamed object */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + 0, + NULL, + NULL); // FIXME: security descriptor! + + /* Create the GUID object */ + Status = ObCreateObject(KernelMode, + WmipGuidObjectType, + &ObjectAttributes, + KernelMode, + NULL, + sizeof(WMIP_GUID_OBJECT), + 0, + 0, + (PVOID*)&GuidObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("WMI: failed to create GUID object: 0x%lx\n", Status); + return Status; + } + + GuidObject->Guid = Guid; + + *OutGuidObject = GuidObject; + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +WmipOpenGuidObject( + POBJECT_ATTRIBUTES ObjectAttributes, + ACCESS_MASK DesiredAccess, + KPROCESSOR_MODE AccessMode, + PHANDLE OutGuidObjectHandle, + PVOID *OutGuidObject) +{ + static UNICODE_STRING Prefix = RTL_CONSTANT_STRING(L"\\WmiGuid\\"); + UNICODE_STRING GuidString; + ULONG HandleAttributes; + PWMIP_GUID_OBJECT GuidObject; + NTSTATUS Status; + PAGED_CODE(); + + /* Check if we have the expected prefix */ + if (!RtlPrefixUnicodeString(ObjectAttributes->ObjectName, &Prefix, FALSE)) + { + DPRINT1("WMI: Invalid prefix for guid object '%wZ'\n", + ObjectAttributes->ObjectName); + return STATUS_INVALID_PARAMETER; + } + + /* Extract the GUID string */ + GuidString = *ObjectAttributes->ObjectName; + GuidString.Buffer += Prefix.Length / sizeof(WCHAR); + GuidString.Length -= Prefix.Length; + + /* Create the GUID object */ + Status = WmipCreateGuidObject(&GuidString, &GuidObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create GUID object: 0x%lx\n", Status); + return Status; + } + + /* Set handle attributes */ + HandleAttributes = (AccessMode == KernelMode) ? OBJ_KERNEL_HANDLE : 0; + + /* Get a handle for the object */ + Status = ObOpenObjectByPointer(GuidObject, + HandleAttributes, + 0, + DesiredAccess, + WmipGuidObjectType, + AccessMode, + OutGuidObjectHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ObOpenObjectByPointer failed: 0x%lx\n", Status); + ObfDereferenceObject(GuidObject); + } + + *OutGuidObject = GuidObject; + + return Status; +} + Propchange: branches/kernel-fun/reactos/ntoskrnl/wmi/guidobj.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/kernel-fun/reactos/ntoskrnl/wmi/wmi.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/wmi… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/wmi/wmi.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/wmi/wmi.c [iso-8859-1] Sat Feb 22 20:07:10 2014 @@ -23,6 +23,14 @@ { UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"\\Driver\\WMIxWDM"); NTSTATUS Status; + + /* Initialize the GUID object type */ + Status = WmipInitializeGuidObjectType(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("WmipInitializeGuidObjectType() failed: 0x%lx\n", Status); + return FALSE; + } /* Create the WMI driver */ Status = IoCreateDriver(&DriverName, WmipDriverEntry); Modified: branches/kernel-fun/reactos/ntoskrnl/wmi/wmip.h URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/wmi… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/wmi/wmip.h [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/wmi/wmip.h [iso-8859-1] Sat Feb 22 20:07:10 2014 @@ -1,5 +1,10 @@ #pragma once + +typedef struct _WMIP_GUID_OBJECT +{ + GUID Guid; +} WMIP_GUID_OBJECT, *PWMIP_GUID_OBJECT; _Function_class_(DRIVER_INITIALIZE) @@ -10,3 +15,16 @@ _In_ PDRIVER_OBJECT DriverObject, _In_ PUNICODE_STRING RegistryPath); +NTSTATUS +NTAPI +WmipInitializeGuidObjectType( + VOID); + +NTSTATUS +NTAPI +WmipOpenGuidObject( + POBJECT_ATTRIBUTES ObjectAttributes, + ACCESS_MASK DesiredAccess, + KPROCESSOR_MODE AccessMode, + PHANDLE OutGuidObjectHandle, + PVOID *OutGuidObject);

10 years, 6 months

[tkreuzer] 62293: [LSASRV] Add beginning of the user mode part of the SRM server.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 22 20:03:53 2014 New Revision: 62293 URL: http://svn.reactos.org/svn/reactos?rev=62293&view=rev Log: [LSASRV] Add beginning of the user mode part of the SRM server. Modified: branches/kernel-fun/reactos/dll/win32/lsasrv/lsasrv.c Modified: branches/kernel-fun/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/dll/win32/ls… ============================================================================== --- branches/kernel-fun/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Sat Feb 22 20:03:53 2014 @@ -6,7 +6,39 @@ * COPYRIGHT: Copyright 2006-2009 Eric Kohl */ +/* INCLUDES ****************************************************************/ + #include "lsasrv.h" +#include <ndk/ntndk.h> + +typedef struct _LSAP_RM_API_MESSAGE +{ + PORT_MESSAGE Header; + ULONG ApiNumber; + union + { + UCHAR Fill[PORT_MAXIMUM_MESSAGE_LENGTH - sizeof(PORT_MESSAGE)]; + struct + { + ULONG Info1; + } WriteLog; + + } u; +} LSAP_RM_API_MESSAGE, *PLSAP_RM_API_MESSAGE; + +enum _LSAP_API_NUMBER +{ + LsapAdtWriteLogApi = 1, + LsapComponentTestApi, + LsapAsyncApi +}; + + +/* GLOBALS *****************************************************************/ + +HANDLE SeLsaCommandPort; +HANDLE SeRmCommandPort; + /* FUNCTIONS ***************************************************************/ @@ -128,6 +160,230 @@ } +VOID +WINAPI +LsapComponentTest( + PLSAP_RM_API_MESSAGE Message) +{ + ERR("Security: LSA Component Test Command Received\n"); + +} + +VOID +WINAPI +LsapAdtWriteLog( + PLSAP_RM_API_MESSAGE Message) +{ + ERR("LsapAdtWriteLog\n"); +} + +VOID +WINAPI +LsapAsync( + PLSAP_RM_API_MESSAGE Message) +{ + ERR("LsapAsync\n"); +} + +DWORD +WINAPI +LsapRmServerThread( + PVOID StartContext) +{ + LSAP_RM_API_MESSAGE Message; + PPORT_MESSAGE ReplyMessage; + REMOTE_PORT_VIEW RemotePortView; + HANDLE MessagePort, DummyPortHandle; + NTSTATUS Status; + + /* Initialize the port message */ + Message.Header.u1.s1.TotalLength = sizeof(Message); + Message.Header.u1.s1.DataLength = 0; + + /* Listen on the LSA command port */ + Status = NtListenPort(SeLsaCommandPort, &Message.Header); + if (!NT_SUCCESS(Status)) + { + ERR("LsapRmServerThread - Port Listen failed 0x%lx\n", Status); + return Status; + } + + /* Setup the Port View Structure */ + RemotePortView.Length = sizeof(REMOTE_PORT_VIEW); + RemotePortView.ViewSize = 0; + RemotePortView.ViewBase = NULL; + + /* Accept the connection */ + Status = NtAcceptConnectPort(&MessagePort, + 0, + &Message.Header, + TRUE, + NULL, + &RemotePortView); + if (!NT_SUCCESS(Status)) + { + ERR("LsapRmServerThread - Port Accept Connect failed 0x%lx\n", Status); + return Status; + } + + /* Complete the connection */ + Status = NtCompleteConnectPort(MessagePort); + if (!NT_SUCCESS(Status)) + { + ERR("LsapRmServerThread - Port Complete Connect failed 0x%lx\n", Status); + return Status; + } + + /* No reply yet */ + ReplyMessage = NULL; + + /* Start looping */ + while (TRUE) + { + /* Wait for a message */ + Status = NtReplyWaitReceivePort(MessagePort, + NULL, + ReplyMessage, + &Message.Header); + if (!NT_SUCCESS(Status)) + { + ERR("LsapRmServerThread - Failed to get message: 0x%lx", Status); + ReplyMessage = NULL; + continue; + } + + /* Check if this is a connection request */ + if (Message.Header.u2.s2.Type == LPC_CONNECTION_REQUEST) + { + /* Reject connection request */ + NtAcceptConnectPort(&DummyPortHandle, + NULL, + &Message.Header, + FALSE, + NULL, + NULL); + + /* Start over */ + ReplyMessage = NULL; + continue; + } + + /* Check if this is an actual request */ + if (Message.Header.u2.s2.Type == LPC_REQUEST) + { + ReplyMessage = &Message.Header; + + switch (Message.ApiNumber) + { + case LsapAdtWriteLogApi: + LsapAdtWriteLog(&Message); + break; + + case LsapAsyncApi: + LsapAsync(&Message); + break; + + case LsapComponentTestApi: + LsapComponentTest(&Message); + break; + + default: + ERR("LsapRmServerThread - invalid API number: 0x%lx\n", + Message.ApiNumber); + ReplyMessage = NULL; + } + + continue; + } + + ERR("LsapRmServerThread - unexpected message type: 0x%lx\n", + Message.Header.u2.s2.Type); + + /* Start over */ + ReplyMessage = NULL; + } +} + +NTSTATUS +WINAPI +LsapRmInitializeServer( + VOID) +{ + UNICODE_STRING Name; + OBJECT_ATTRIBUTES ObjectAttributes; + SECURITY_QUALITY_OF_SERVICE SecurityQos; + HANDLE InitEvent; + HANDLE ThreadHandle; + DWORD ThreadId; + NTSTATUS Status; + + /* Create the LSA command port */ + RtlInitUnicodeString(&Name, L"\\SeLsaCommandPort"); + InitializeObjectAttributes(&ObjectAttributes, &Name, 0, NULL, NULL); + Status = NtCreatePort(&SeLsaCommandPort, + &ObjectAttributes, + 0, + PORT_MAXIMUM_MESSAGE_LENGTH, + 2 * PAGE_SIZE); + if (!NT_SUCCESS(Status)) + { + ERR("LsapRmInitializeServer - Port Create failed 0x%lx\n", Status); + return Status; + } + + /* Open the LSA init event */ + RtlInitUnicodeString(&Name, L"\\SeLsaInitEvent"); + InitializeObjectAttributes(&ObjectAttributes, &Name, 0, NULL, NULL); + Status = NtOpenEvent(&InitEvent, 2, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + ERR("LsapRmInitializeServer - Lsa Init Event Open failed 0x%lx\n", Status); + return Status; + } + + /* Signal the kernel, that we are ready */ + Status = NtSetEvent(InitEvent, 0); + if (!NT_SUCCESS(Status)) + { + ERR("LsapRmInitializeServer - Set Init Event failed 0x%lx\n", Status); + return Status; + } + + /* Setup the QoS structure */ + SecurityQos.ImpersonationLevel = SecurityIdentification; + SecurityQos.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING; + SecurityQos.EffectiveOnly = TRUE; + + /* Connect to the kernel server */ + RtlInitUnicodeString(&Name, L"\\SeRmCommandPort"); + Status = NtConnectPort(&SeRmCommandPort, + &Name, + &SecurityQos, + NULL, + NULL, + NULL, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("LsapRmInitializeServer - Connect to Rm Command Port failed 0x%lx\n", Status); + return Status; + } + + /* Create the server thread */ + ThreadHandle = CreateThread(NULL, 0, LsapRmServerThread, NULL, 0, &ThreadId); + if (ThreadHandle == NULL) + { + ERR("LsapRmInitializeServer - Create Thread failed 0x%lx\n", Status); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Close the server thread handle */ + CloseHandle(ThreadHandle); + + return STATUS_SUCCESS; +} + NTSTATUS WINAPI LsapInitLsa(VOID) { @@ -139,6 +395,14 @@ /* Initialize the well known SIDs */ LsapInitSids(); + + /* Initialize the SRM server */ + Status = LsapRmInitializeServer(); + if (!NT_SUCCESS(Status)) + { + ERR("LsapRmInitializeServer() failed (Status 0x%08lx)\n", Status); + return Status; + } /* Initialize the LSA database */ LsapInitDatabase();

10 years, 6 months

← Newer
1
...
4
5
6
7
8
9
10
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2014