Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[pschweitzer] 65856: [NTOSKRNL] - Implement IopGetDeviceAttachmentBase() which allows getting the base device of the device stack given any device object in it - Implement IopGetDevicePDO() which r...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Dec 28 10:05:29 2014 New Revision: 65856 URL: http://svn.reactos.org/svn/reactos?rev=65856&view=rev Log: [NTOSKRNL] - Implement IopGetDeviceAttachmentBase() which allows getting the base device of the device stack given any device object in it - Implement IopGetDevicePDO() which returns the physical device object of the device stack given any device object in it - Implement IopSetDeviceSecurityDescriptor() which will swap the old security descriptor of a device object with a new provided one - Implement IopSetDeviceSecurityDescriptors() which will swap the old security descriptor with a new provided one in all the device objects from the lowest provided to the uppest provided one. - Fix a fixme in IopGetSetSecurityObject(), the operation SetSecurityDescriptor is now fully implemented for both PDO & DO. This is required by VMware driver vmci.sys. Even though, the installation doesn't get any better; it just changes the BSOD, we now face a memory corruption (in SE). CORE-7991 Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Sun Dec 28 10:05:29 2014 @@ -14,6 +14,8 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +extern ERESOURCE IopSecurityResource; /* PRIVATE FUNCTIONS *********************************************************/ @@ -1308,6 +1310,174 @@ } } +PDEVICE_OBJECT +NTAPI +IopGetDeviceAttachmentBase(PDEVICE_OBJECT DeviceObject) +{ + PDEVICE_OBJECT PDO = DeviceObject; + + /* Go down the stack to attempt to get the PDO */ + for (; ((PEXTENDED_DEVOBJ_EXTENSION)PDO->DeviceObjectExtension)->AttachedTo != NULL; + PDO = ((PEXTENDED_DEVOBJ_EXTENSION)PDO->DeviceObjectExtension)->AttachedTo); + + return PDO; +} + +PDEVICE_OBJECT +NTAPI +IopGetDevicePDO(PDEVICE_OBJECT DeviceObject) +{ + KIRQL OldIrql; + PDEVICE_OBJECT PDO; + + ASSERT(DeviceObject != NULL); + + OldIrql = KeAcquireQueuedSpinLock(LockQueueIoDatabaseLock); + /* Get the base DO */ + PDO = IopGetDeviceAttachmentBase(DeviceObject); + /* Check whether that's really a PDO and if so, keep it */ + if ((PDO->Flags & DO_BUS_ENUMERATED_DEVICE) != DO_BUS_ENUMERATED_DEVICE) + { + PDO = NULL; + } + else + { + ObReferenceObject(PDO); + } + KeReleaseQueuedSpinLock(LockQueueIoDatabaseLock, OldIrql); + + return PDO; +} + +NTSTATUS +NTAPI +IopSetDeviceSecurityDescriptor(IN PDEVICE_OBJECT DeviceObject, + IN PSECURITY_INFORMATION SecurityInformation, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN POOL_TYPE PoolType, + IN PGENERIC_MAPPING GenericMapping) +{ + NTSTATUS Status; + PSECURITY_DESCRIPTOR OldSecurityDescriptor, CachedSecurityDescriptor, NewSecurityDescriptor; + + PAGED_CODE(); + + /* Keep attempting till we find our old SD or fail */ + while (TRUE) + { + KeEnterCriticalRegion(); + ExAcquireResourceSharedLite(&IopSecurityResource, TRUE); + + /* Get our old SD and reference it */ + OldSecurityDescriptor = DeviceObject->SecurityDescriptor; + if (OldSecurityDescriptor != NULL) + { + ObReferenceSecurityDescriptor(OldSecurityDescriptor, 1); + } + + ExReleaseResourceLite(&IopSecurityResource); + KeLeaveCriticalRegion(); + + /* Set the SD information */ + NewSecurityDescriptor = OldSecurityDescriptor; + Status = SeSetSecurityDescriptorInfo(NULL, SecurityInformation, + SecurityDescriptor, &NewSecurityDescriptor, + PoolType, GenericMapping); + + if (!NT_SUCCESS(Status)) + { + if (OldSecurityDescriptor != NULL) + { + ObDereferenceSecurityDescriptor(OldSecurityDescriptor, 1); + } + + break; + } + + /* Add the new DS to the internal cache */ + Status = ObLogSecurityDescriptor(NewSecurityDescriptor, + &CachedSecurityDescriptor, 1); + ExFreePool(NewSecurityDescriptor); + if (!NT_SUCCESS(Status)) + { + ObDereferenceSecurityDescriptor(OldSecurityDescriptor, 1); + break; + } + + KeEnterCriticalRegion(); + ExAcquireResourceSharedLite(&IopSecurityResource, TRUE); + /* Check if someone changed it in our back */ + if (DeviceObject->SecurityDescriptor == OldSecurityDescriptor) + { + /* We're clear, do the swap */ + DeviceObject->SecurityDescriptor = CachedSecurityDescriptor; + ExReleaseResourceLite(&IopSecurityResource); + KeLeaveCriticalRegion(); + + /* And dereference old SD (twice - us + not in use) */ + ObDereferenceSecurityDescriptor(OldSecurityDescriptor, 2); + + break; + } + ExReleaseResourceLite(&IopSecurityResource); + KeLeaveCriticalRegion(); + + /* If so, try again */ + ObDereferenceSecurityDescriptor(OldSecurityDescriptor, 1); + ObDereferenceSecurityDescriptor(CachedSecurityDescriptor, 1); + } + + return Status; +} + +NTSTATUS +NTAPI +IopSetDeviceSecurityDescriptors(IN PDEVICE_OBJECT UpperDeviceObject, + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PSECURITY_INFORMATION SecurityInformation, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN POOL_TYPE PoolType, + IN PGENERIC_MAPPING GenericMapping) +{ + PDEVICE_OBJECT CurrentDO = PhysicalDeviceObject, NextDevice; + NTSTATUS Status = STATUS_SUCCESS, TmpStatus; + + PAGED_CODE(); + + ASSERT(PhysicalDeviceObject != NULL); + + /* We always reference the DO we're working on */ + ObReferenceObject(CurrentDO); + + /* Go up from PDO to latest DO */ + do + { + /* Attempt to set the new SD on it */ + TmpStatus = IopSetDeviceSecurityDescriptor(CurrentDO, SecurityInformation, + SecurityDescriptor, PoolType, + GenericMapping); + /* Was our last one? Remember that status then */ + if (CurrentDO == UpperDeviceObject) + { + Status = TmpStatus; + } + + /* Try to move to the next DO (and thus, reference it) */ + NextDevice = CurrentDO->AttachedDevice; + if (NextDevice) + { + ObReferenceObject(NextDevice); + } + + /* Dereference current DO and move to the next one */ + ObDereferenceObject(CurrentDO); + CurrentDO = NextDevice; + } + while (CurrentDO != NULL); + + return Status; +} + NTSTATUS NTAPI IopGetSetSecurityObject(IN PVOID ObjectBody, @@ -1385,11 +1555,34 @@ /* Return success */ return STATUS_SUCCESS; } - else - { - DPRINT1("FIXME: Set SD unimplemented for Devices\n"); + else if (OperationCode == SetSecurityDescriptor) + { + /* Get the Physical Device Object if any */ + PDEVICE_OBJECT PDO = IopGetDevicePDO(DeviceObject); + + if (PDO != NULL) + { + /* Apply the new SD to any DO in the path from PDO to current DO */ + Status = IopSetDeviceSecurityDescriptors(DeviceObject, PDO, + SecurityInformation, + SecurityDescriptor, + PoolType, GenericMapping); + ObDereferenceObject(PDO); + } + else + { + /* Otherwise, just set for ourselves */ + Status = IopSetDeviceSecurityDescriptor(DeviceObject, + SecurityInformation, + SecurityDescriptor, + PoolType, GenericMapping); + } + return STATUS_SUCCESS; } + + /* Shouldn't happen */ + return STATUS_SUCCESS; } else if (OperationCode == DeleteSecurityDescriptor) {

9 years, 8 months

[ekohl] 65855: [USETUP] Update the on-disk partition tables immediately after modifying the in-memory tables.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Dec 28 09:16:41 2014 New Revision: 65855 URL: http://svn.reactos.org/svn/reactos?rev=65855&view=rev Log: [USETUP] Update the on-disk partition tables immediately after modifying the in-memory tables. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Dec 28 09:16:41 2014 @@ -1834,6 +1834,7 @@ ULONGLONG DiskSize; ULONGLONG SectorCount; PCHAR Unit; + NTSTATUS Status; if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || @@ -1959,6 +1960,14 @@ CreatePrimaryPartition(PartitionList, SectorCount, FALSE); + + Status = WriteDirtyPartitions(PartitionList); + if (!NT_SUCCESS(Status)) + { + DPRINT("WriteDirtyPartitions() failed\n"); + MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } return SELECT_PARTITION_PAGE; } @@ -1981,6 +1990,7 @@ ULONGLONG DiskSize; ULONGLONG SectorCount; PCHAR Unit; + NTSTATUS Status; if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || @@ -2105,6 +2115,14 @@ CreateExtendedPartition(PartitionList, SectorCount); + + Status = WriteDirtyPartitions(PartitionList); + if (!NT_SUCCESS(Status)) + { + DPRINT("WriteDirtyPartitions() failed\n"); + MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } return SELECT_PARTITION_PAGE; } @@ -2127,6 +2145,7 @@ ULONGLONG DiskSize; ULONGLONG SectorCount; PCHAR Unit; + NTSTATUS Status; if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || @@ -2252,6 +2271,14 @@ CreateLogicalPartition(PartitionList, SectorCount); + Status = WriteDirtyPartitions(PartitionList); + if (!NT_SUCCESS(Status)) + { + DPRINT("WriteDirtyPartitions() failed\n"); + MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + return SELECT_PARTITION_PAGE; } } @@ -2269,6 +2296,7 @@ ULONGLONG PartSize; PCHAR Unit; PCHAR PartType; + NTSTATUS Status; if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || @@ -2420,6 +2448,14 @@ else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */ { DeleteCurrentPartition(PartitionList); + + Status = WriteDirtyPartitions(PartitionList); + if (!NT_SUCCESS(Status)) + { + DPRINT("WriteDirtyPartitions() failed\n"); + MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } return SELECT_PARTITION_PAGE; } @@ -2792,9 +2828,10 @@ CheckActiveBootPartition(PartitionList); - if (WritePartitionsToDisk(PartitionList) == FALSE) - { - DPRINT("WritePartitionsToDisk() failed\n"); + Status = WriteDirtyPartitions(PartitionList); + if (!NT_SUCCESS(Status)) + { + DPRINT("WriteDirtyPartitions() failed\n"); MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3706,6 +3743,7 @@ BOOLEAN InstallOnFloppy; USHORT Line = 12; WCHAR PathBuffer[MAX_PATH]; + NTSTATUS Status; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); @@ -3713,9 +3751,10 @@ CheckActiveBootPartition(PartitionList); /* Update the partition table because we may have changed the active partition */ - if (WritePartitionsToDisk(PartitionList) == FALSE) - { - DPRINT("WritePartitionsToDisk() failed\n"); + Status = WriteDirtyPartitions(PartitionList); + if (!NT_SUCCESS(Status)) + { + DPRINT("WriteDirtyPartitions() failed\n"); MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Dec 28 09:16:41 2014 @@ -2931,15 +2931,16 @@ } -BOOLEAN -WritePartitionsToDisk( +NTSTATUS +WriteDirtyPartitions( PPARTLIST List) { PLIST_ENTRY Entry; PDISKENTRY DiskEntry; + NTSTATUS Status; if (List == NULL) - return TRUE; + return STATUS_SUCCESS; Entry = List->DiskListHead.Flink; while (Entry != &List->DiskListHead) @@ -2948,13 +2949,17 @@ if (DiskEntry->Dirty == TRUE) { - WritePartitons(List, DiskEntry); + Status = WritePartitons(List, DiskEntry); + if (!NT_SUCCESS(Status)) + return Status; + + DiskEntry->Dirty = FALSE; } Entry = Entry->Flink; } - return TRUE; + return STATUS_SUCCESS; } Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Sun Dec 28 09:16:41 2014 @@ -247,8 +247,8 @@ CheckForLinuxFdiskPartitions( PPARTLIST List); -BOOLEAN -WritePartitionsToDisk( +NTSTATUS +WriteDirtyPartitions( PPARTLIST List); ULONG

9 years, 8 months

[fireball] 65854: [RAPPS] - Add another tiny text-editor Akelpad, which works "good enough" in ReactOS. Suggested by sergeygraf@yandex.ru, patch created by rechitskiy@reactos.org

by fireball＠svn.reactos.org

Author: fireball Date: Sat Dec 27 22:19:36 2014 New Revision: 65854 URL: http://svn.reactos.org/svn/reactos?rev=65854&view=rev Log: [RAPPS] - Add another tiny text-editor Akelpad, which works "good enough" in ReactOS. Suggested by sergeygraf(a)yandex.ru, patch created by rechitskiy(a)reactos.org Added: trunk/reactos/base/applications/rapps/rapps/akelpad.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/akelpad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/akelpad.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/akelpad.txt [iso-8859-1] Sat Dec 27 22:19:36 2014 @@ -0,0 +1,20 @@ +ï»¿; UTF-8 +; Russian translation by Alexander Rechitskiy (jedi-to-be) (rechitskiy(a)reactos.org) + +[Section] +Name = AkelPad +Version = 4.9.1 +License = GPL +Description = AkelPad - is an open source editor for plain text. It is designed to be a small and fast. +Size = 1.11 MB +Category = 6 +URLSite = http://akelpad.sourceforge.net/ +URLDownload = http://switch.dl.sourceforge.net/project/akelpad/AkelPad%204/4.9.1/AkelPad-… +CDPath = none + +[Section.0419] +Description = AkelPad - ÑÐµÐºÑÑÐ¾Ð²ÑÐ¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ñ Ð¾ÑÐºÑÑÑÑÐ¼ Ð¸ÑÑÐ¾Ð´Ð½ÑÐ¼ ÐºÐ¾Ð´Ð¾Ð¼, ÑÐ¾Ð·Ð´Ð°Ð½Ð½ÑÐ¹, ÑÑÐ¾Ð±Ñ Ð±ÑÑÑ Ð¼Ð°Ð»ÐµÐ½ÑÐºÐ¸Ð¼ Ð¸ Ð±ÑÑÑÑÑÐ¼. +Size = 1.11 MB + + + Propchange: trunk/reactos/base/applications/rapps/rapps/akelpad.txt ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 8 months

[hpoussin] 65853: [ADVAPI/LSASRV] Implement LookupPrivilegeDisplayNameA, LookupPrivilegeDisplayNameW, LsaLookupPrivilegeDisplayName, LsarLookupPrivilegeDisplayName Also partly implement LsarpLookup...

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Dec 27 19:57:42 2014 New Revision: 65853 URL: http://svn.reactos.org/svn/reactos?rev=65853&view=rev Log: [ADVAPI/LSASRV] Implement LookupPrivilegeDisplayNameA, LookupPrivilegeDisplayNameW, LsaLookupPrivilegeDisplayName, LsarLookupPrivilegeDisplayName Also partly implement LsarpLookupPrivilegeDisplayName (currently, privilege description is the same as privilege name) Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/advapi32/sec/misc.c trunk/reactos/dll/win32/advapi32/wine/security.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/privileges.c trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sat Dec 27 19:57:42 2014 @@ -907,11 +907,35 @@ LsaLookupPrivilegeDisplayName(IN LSA_HANDLE PolicyHandle, IN PLSA_UNICODE_STRING Name, OUT PLSA_UNICODE_STRING *DisplayName, - OUT PSHORT LanguageReturned) -{ - FIXME("LsaLookupPrivilegeDisplayName(%p %p %p %p)\n", + OUT PUSHORT LanguageReturned) +{ + PRPC_UNICODE_STRING DisplayNameBuffer = NULL; + NTSTATUS Status; + + TRACE("LsaLookupPrivilegeDisplayName(%p %p %p %p)\n", PolicyHandle, Name, DisplayName, LanguageReturned); - return STATUS_NOT_IMPLEMENTED; + + RpcTryExcept + { + Status = LsarLookupPrivilegeDisplayName(PolicyHandle, + (PRPC_UNICODE_STRING)Name, + GetUserDefaultUILanguage(), + GetSystemDefaultUILanguage(), + &DisplayNameBuffer, + LanguageReturned); + + *DisplayName = (PUNICODE_STRING)DisplayNameBuffer; + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + if (DisplayNameBuffer != NULL) + MIDL_user_free(DisplayNameBuffer); + + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; } Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Sat Dec 27 19:57:42 2014 @@ -891,6 +891,75 @@ return TRUE; } +/********************************************************************** + * LookupPrivilegeDisplayNameW EXPORTED + * + * @unimplemented + */ +BOOL +WINAPI +LookupPrivilegeDisplayNameW(LPCWSTR lpSystemName, + LPCWSTR lpName, + LPWSTR lpDisplayName, + LPDWORD cchDisplayName, + LPDWORD lpLanguageId) +{ + OBJECT_ATTRIBUTES ObjectAttributes = {0}; + UNICODE_STRING SystemName, Name; + PUNICODE_STRING DisplayName; + LSA_HANDLE PolicyHandle = NULL; + USHORT LanguageId; + NTSTATUS Status; + + TRACE("%S,%S,%p,%p,%p\n", lpSystemName, lpName, lpDisplayName, cchDisplayName, lpLanguageId); + + RtlInitUnicodeString(&SystemName, lpSystemName); + RtlInitUnicodeString(&Name, lpName); + + Status = LsaOpenPolicy(lpSystemName ? &SystemName : NULL, + &ObjectAttributes, + POLICY_LOOKUP_NAMES, + &PolicyHandle); + if (!NT_SUCCESS(Status)) + { + SetLastError(LsaNtStatusToWinError(Status)); + return FALSE; + } + + Status = LsaLookupPrivilegeDisplayName(PolicyHandle, &Name, &DisplayName, &LanguageId); + if (NT_SUCCESS(Status)) + { + *lpLanguageId = LanguageId; + if (DisplayName->Length + sizeof(WCHAR) > *cchDisplayName * sizeof(WCHAR)) + { + Status = STATUS_BUFFER_TOO_SMALL; + + *cchDisplayName = (DisplayName->Length + sizeof(WCHAR)) / sizeof(WCHAR); + } + else + { + RtlMoveMemory(lpDisplayName, + DisplayName->Buffer, + DisplayName->Length); + lpDisplayName[DisplayName->Length / sizeof(WCHAR)] = 0; + + *cchDisplayName = DisplayName->Length / sizeof(WCHAR); + } + + LsaFreeMemory(DisplayName->Buffer); + LsaFreeMemory(DisplayName); + } + + LsaClose(PolicyHandle); + + if (!NT_SUCCESS(Status)) + { + SetLastError(LsaNtStatusToWinError(Status)); + return FALSE; + } + + return TRUE; +} static DWORD pGetSecurityInfoCheck(SECURITY_INFORMATION SecurityInfo, Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sat Dec 27 19:57:42 2014 @@ -1102,31 +1102,54 @@ LookupPrivilegeDisplayNameA(LPCSTR lpSystemName, LPCSTR lpName, LPSTR lpDisplayName, - LPDWORD cbDisplayName, + LPDWORD cchDisplayName, LPDWORD lpLanguageId) { - FIXME("%s() not implemented!\n", __FUNCTION__); - SetLastError (ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/********************************************************************** - * LookupPrivilegeDisplayNameW EXPORTED - * - * @unimplemented - */ -BOOL -WINAPI -LookupPrivilegeDisplayNameW(LPCWSTR lpSystemName, - LPCWSTR lpName, - LPWSTR lpDisplayName, - LPDWORD cbDisplayName, - LPDWORD lpLanguageId) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - SetLastError (ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + UNICODE_STRING lpSystemNameW; + UNICODE_STRING lpNameW; + BOOL ret; + DWORD wLen = 0; + + TRACE("%s %s %p %p %p\n", debugstr_a(lpSystemName), debugstr_a(lpName), lpName, cchDisplayName, lpLanguageId); + + RtlCreateUnicodeStringFromAsciiz(&lpSystemNameW, lpSystemName); + RtlCreateUnicodeStringFromAsciiz(&lpNameW, lpName); + ret = LookupPrivilegeDisplayNameW(lpSystemNameW.Buffer, lpNameW.Buffer, NULL, &wLen, lpLanguageId); + if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + LPWSTR lpDisplayNameW = HeapAlloc(GetProcessHeap(), 0, wLen * sizeof(WCHAR)); + + ret = LookupPrivilegeDisplayNameW(lpSystemNameW.Buffer, lpNameW.Buffer, lpDisplayNameW, + &wLen, lpLanguageId); + if (ret) + { + unsigned int len = WideCharToMultiByte(CP_ACP, 0, lpDisplayNameW, -1, lpDisplayName, + *cchDisplayName, NULL, NULL); + + if (len == 0) + { + /* WideCharToMultiByte failed */ + ret = FALSE; + } + else if (len > *cchDisplayName) + { + *cchDisplayName = len; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + else + { + /* WideCharToMultiByte succeeded, output length needs to be + * length not including NULL terminator + */ + *cchDisplayName = len - 1; + } + } + HeapFree(GetProcessHeap(), 0, lpDisplayNameW); + } + RtlFreeUnicodeString(&lpSystemNameW); + RtlFreeUnicodeString(&lpNameW); + return ret; } /********************************************************************** Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sat Dec 27 19:57:42 2014 @@ -2104,8 +2104,28 @@ PRPC_UNICODE_STRING *DisplayName, USHORT *LanguageReturned) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + TRACE("LsarLookupPrivilegeDisplayName(%p, %p, %u, %u, %p, %p)\n", + PolicyHandle, Name, ClientLanguage, ClientSystemDefaultLanguage, DisplayName, LanguageReturned); + + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, + POLICY_LOOKUP_NAMES, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("Invalid handle\n"); + return Status; + } + + Status = LsarpLookupPrivilegeDisplayName(Name, + ClientLanguage, + ClientSystemDefaultLanguage, + DisplayName, + LanguageReturned); + + return Status; } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sat Dec 27 19:57:42 2014 @@ -303,6 +303,13 @@ PRPC_UNICODE_STRING *Name); NTSTATUS +LsarpLookupPrivilegeDisplayName(PRPC_UNICODE_STRING Name, + USHORT ClientLanguage, + USHORT ClientSystemDefaultLanguage, + PRPC_UNICODE_STRING *DisplayName, + USHORT *LanguageReturned); + +NTSTATUS LsarpLookupPrivilegeValue(PRPC_UNICODE_STRING Name, PLUID Value); Modified: trunk/reactos/dll/win32/lsasrv/privileges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/privilege… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] Sat Dec 27 19:57:42 2014 @@ -118,6 +118,39 @@ return STATUS_NO_SUCH_PRIVILEGE; } +NTSTATUS +LsarpLookupPrivilegeDisplayName(PRPC_UNICODE_STRING Name, + USHORT ClientLanguage, + USHORT ClientSystemDefaultLanguage, + PRPC_UNICODE_STRING *DisplayName, + USHORT *LanguageReturned) +{ + PRPC_UNICODE_STRING DisplayNameBuffer; + UNIMPLEMENTED; + + /* For now, description is equal to privilege name */ + + DisplayNameBuffer = MIDL_user_allocate(sizeof(RPC_UNICODE_STRING)); + if (DisplayNameBuffer == NULL) + { + return STATUS_NO_MEMORY; + } + DisplayNameBuffer->Length = Name->Length; + DisplayNameBuffer->MaximumLength = Name->MaximumLength; + + DisplayNameBuffer->Buffer = MIDL_user_allocate(DisplayNameBuffer->MaximumLength); + if (DisplayNameBuffer->Buffer == NULL) + { + MIDL_user_free(DisplayNameBuffer); + return STATUS_NO_MEMORY; + } + + wcscpy(DisplayNameBuffer->Buffer, Name->Buffer); + + *DisplayName = DisplayNameBuffer; + + return STATUS_SUCCESS; +} NTSTATUS LsarpLookupPrivilegeValue(PRPC_UNICODE_STRING Name, Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Sat Dec 27 19:57:42 2014 @@ -724,7 +724,7 @@ NTSTATUS NTAPI LsaLookupNames2(LSA_HANDLE,ULONG,ULONG,PLSA_UNICODE_STRING, PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID2*); NTSTATUS NTAPI LsaLookupPrivilegeDisplayName(LSA_HANDLE,PLSA_UNICODE_STRING, - PLSA_UNICODE_STRING*,PSHORT); + PLSA_UNICODE_STRING*,PUSHORT); NTSTATUS NTAPI LsaLookupPrivilegeName(LSA_HANDLE,PLUID,PLSA_UNICODE_STRING*); NTSTATUS NTAPI LsaLookupPrivilegeValue(LSA_HANDLE,PLSA_UNICODE_STRING,PLUID); NTSTATUS NTAPI LsaLookupSids(LSA_HANDLE,ULONG,PSID*,

9 years, 8 months

[hbelusca] 65852: [WIN32K] - Put GDI initialization function(s) in a dedicated file. - Whitespace fixes...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 27 19:16:05 2014 New Revision: 65852 URL: http://svn.reactos.org/svn/reactos?rev=65852&view=rev Log: [WIN32K] - Put GDI initialization function(s) in a dedicated file. - Whitespace fixes... Added: trunk/reactos/win32ss/gdi/ntgdi/init.c (with props) Modified: trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/gdi/eng/stubs.c trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/ntuser.c Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Sat Dec 27 19:16:05 2014 @@ -167,6 +167,7 @@ gdi/ntgdi/gdiobj.c gdi/ntgdi/gdipool.c gdi/ntgdi/icm.c + gdi/ntgdi/init.c gdi/ntgdi/line.c gdi/ntgdi/metafile.c gdi/ntgdi/palette.c Modified: trunk/reactos/win32ss/gdi/eng/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/stubs.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/stubs.c [iso-8859-1] Sat Dec 27 19:16:05 2014 @@ -1538,16 +1538,6 @@ } /* - * @implemented - */ -BOOL -APIENTRY -NtGdiInit(VOID) -{ - return TRUE; -} - -/* * @unimplemented */ ULONG Added: trunk/reactos/win32ss/gdi/ntgdi/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/init.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/init.c (added) +++ trunk/reactos/win32ss/gdi/ntgdi/init.c [iso-8859-1] Sat Dec 27 19:16:05 2014 @@ -0,0 +1,25 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Win32k subsystem + * PURPOSE: Initialization of GDI + * FILE: win32ss/gdi/ntgdi/init.c + * PROGRAMER: + */ + +#include <win32k.h> + +#define NDEBUG +#include <debug.h> +#include <kdros.h> + +/* + * @implemented + */ +BOOL +APIENTRY +NtGdiInit(VOID) +{ + return TRUE; +} + +/* EOF */ Propchange: trunk/reactos/win32ss/gdi/ntgdi/init.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Dec 27 19:16:05 2014 @@ -973,6 +973,10 @@ DWORD dwInstalledEventHooks; PERUSERSERVERINFO; } SERVERINFO, *PSERVERINFO; + +#ifdef _M_IX86 +C_ASSERT(sizeof(SERVERINFO) <= PAGE_SIZE); +#endif // Server event activity bits. Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Sat Dec 27 19:16:05 2014 @@ -732,10 +732,6 @@ ResetCsrApiPort(); ResetCsrProcess(); } - -#ifdef _M_IX86 -C_ASSERT(sizeof(SERVERINFO) <= PAGE_SIZE); -#endif // Return on failure #define NT_ROF(x) \ Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Sat Dec 27 19:16:05 2014 @@ -2,13 +2,13 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: ntuser init. and main funcs. - * FILE: subsystems/win32/win32k/ntuser/ntuser.c + * FILE: win32ss/user/ntuser/ntuser.c */ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserMisc); -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ PTHREADINFO gptiCurrent = NULL; PPROCESSINFO gppiInputProvider = NULL; @@ -21,73 +21,72 @@ BOOL ClientPfnInit = FALSE; ATOM gaGuiConsoleWndClass; -/* PRIVATE FUNCTIONS *********************************************************/ +/* PRIVATE FUNCTIONS **********************************************************/ static NTSTATUS FASTCALL InitUserAtoms(VOID) { - - gpsi->atomSysClass[ICLS_MENU] = 32768; - gpsi->atomSysClass[ICLS_DESKTOP] = 32769; - gpsi->atomSysClass[ICLS_DIALOG] = 32770; - gpsi->atomSysClass[ICLS_SWITCH] = 32771; - gpsi->atomSysClass[ICLS_ICONTITLE] = 32772; - gpsi->atomSysClass[ICLS_TOOLTIPS] = 32774; - - /* System Message Atom */ - AtomMessage = IntAddGlobalAtom(L"Message", TRUE); - gpsi->atomSysClass[ICLS_HWNDMESSAGE] = AtomMessage; - - /* System Context Help Id Atom */ - gpsi->atomContextHelpIdProp = IntAddGlobalAtom(L"SysCH", TRUE); - - gpsi->atomIconSmProp = IntAddGlobalAtom(L"SysICS", TRUE); - gpsi->atomIconProp = IntAddGlobalAtom(L"SysIC", TRUE); - - gpsi->atomFrostedWindowProp = IntAddGlobalAtom(L"SysFrostedWindow", TRUE); - - /* - * FIXME: AddPropW uses the global kernel atom table, thus leading to conflicts if we use - * the win32k atom table for this ones. What is the right thing to do ? - */ - // AtomWndObj = IntAddGlobalAtom(L"SysWNDO", TRUE); - NtAddAtom(L"SysWNDO", 14, &AtomWndObj); - AtomLayer = IntAddGlobalAtom(L"SysLayer", TRUE); - AtomFlashWndState = IntAddGlobalAtom(L"FlashWState", TRUE); - - return STATUS_SUCCESS; -} - -/* FUNCTIONS *****************************************************************/ + gpsi->atomSysClass[ICLS_MENU] = 32768; + gpsi->atomSysClass[ICLS_DESKTOP] = 32769; + gpsi->atomSysClass[ICLS_DIALOG] = 32770; + gpsi->atomSysClass[ICLS_SWITCH] = 32771; + gpsi->atomSysClass[ICLS_ICONTITLE] = 32772; + gpsi->atomSysClass[ICLS_TOOLTIPS] = 32774; + + /* System Message Atom */ + AtomMessage = IntAddGlobalAtom(L"Message", TRUE); + gpsi->atomSysClass[ICLS_HWNDMESSAGE] = AtomMessage; + + /* System Context Help Id Atom */ + gpsi->atomContextHelpIdProp = IntAddGlobalAtom(L"SysCH", TRUE); + + gpsi->atomIconSmProp = IntAddGlobalAtom(L"SysICS", TRUE); + gpsi->atomIconProp = IntAddGlobalAtom(L"SysIC", TRUE); + + gpsi->atomFrostedWindowProp = IntAddGlobalAtom(L"SysFrostedWindow", TRUE); + + /* + * FIXME: AddPropW uses the global kernel atom table, thus leading to conflicts if we use + * the win32k atom table for this ones. What is the right thing to do ? + */ + // AtomWndObj = IntAddGlobalAtom(L"SysWNDO", TRUE); + NtAddAtom(L"SysWNDO", 14, &AtomWndObj); + AtomLayer = IntAddGlobalAtom(L"SysLayer", TRUE); + AtomFlashWndState = IntAddGlobalAtom(L"FlashWState", TRUE); + + return STATUS_SUCCESS; +} + +/* FUNCTIONS ******************************************************************/ INIT_FUNCTION NTSTATUS NTAPI InitUserImpl(VOID) { - NTSTATUS Status; - - ExInitializeResourceLite(&UserLock); - - if (!UserCreateHandleTable()) - { - ERR("Failed creating handle table\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - Status = InitSessionImpl(); - if (!NT_SUCCESS(Status)) - { - ERR("Error init session impl.\n"); - return Status; - } - - InitUserAtoms(); - - InitSysParams(); - - return STATUS_SUCCESS; + NTSTATUS Status; + + ExInitializeResourceLite(&UserLock); + + if (!UserCreateHandleTable()) + { + ERR("Failed creating handle table\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = InitSessionImpl(); + if (!NT_SUCCESS(Status)) + { + ERR("Error init session impl.\n"); + return Status; + } + + InitUserAtoms(); + + InitSysParams(); + + return STATUS_SUCCESS; } NTSTATUS @@ -110,7 +109,7 @@ Status = UserCreateWinstaDirectory(); if (!NT_SUCCESS(Status)) return Status; - /* Initialize Video. */ + /* Initialize Video */ Status = InitVideo(); if (!NT_SUCCESS(Status)) return Status; @@ -123,7 +122,7 @@ // Create ThreadInfo for this Thread! // { - /* Initialize the current thread. */ + /* Initialize the current thread */ Status = UserCreateThreadInfo(PsGetCurrentThread()); if (!NT_SUCCESS(Status)) return Status; @@ -135,10 +134,10 @@ if (gpsi->hbrGray == NULL) { - hPattern55AABitmap = GreCreateBitmap(8, 8, 1, 1, (LPBYTE)wPattern55AA); - gpsi->hbrGray = IntGdiCreatePatternBrush(hPattern55AABitmap); - GreDeleteObject(hPattern55AABitmap); - GreSetBrushOwner(gpsi->hbrGray, GDI_OBJ_HMGR_PUBLIC); + hPattern55AABitmap = GreCreateBitmap(8, 8, 1, 1, (LPBYTE)wPattern55AA); + gpsi->hbrGray = IntGdiCreatePatternBrush(hPattern55AABitmap); + GreDeleteObject(hPattern55AABitmap); + GreSetBrushOwner(gpsi->hbrGray, GDI_OBJ_HMGR_PUBLIC); } return STATUS_SUCCESS; @@ -150,9 +149,9 @@ NTSTATUS APIENTRY NtUserInitialize( - DWORD dwWinVersion, - HANDLE hPowerRequestEvent, - HANDLE hMediaRequestEvent) + DWORD dwWinVersion, + HANDLE hPowerRequestEvent, + HANDLE hMediaRequestEvent) { NTSTATUS Status; @@ -201,38 +200,40 @@ */ BOOL FASTCALL UserIsEntered(VOID) { - return ExIsResourceAcquiredExclusiveLite(&UserLock) - || ExIsResourceAcquiredSharedLite(&UserLock); + return ExIsResourceAcquiredExclusiveLite(&UserLock) || + ExIsResourceAcquiredSharedLite(&UserLock); } BOOL FASTCALL UserIsEnteredExclusive(VOID) { - return ExIsResourceAcquiredExclusiveLite(&UserLock); + return ExIsResourceAcquiredExclusiveLite(&UserLock); } VOID FASTCALL CleanupUserImpl(VOID) { - ExDeleteResourceLite(&UserLock); + ExDeleteResourceLite(&UserLock); } VOID FASTCALL UserEnterShared(VOID) { - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&UserLock, TRUE); + KeEnterCriticalRegion(); + ExAcquireResourceSharedLite(&UserLock, TRUE); } VOID FASTCALL UserEnterExclusive(VOID) { - ASSERT_NOGDILOCKS(); - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&UserLock, TRUE); - gptiCurrent = PsGetCurrentThreadWin32Thread(); + ASSERT_NOGDILOCKS(); + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&UserLock, TRUE); + gptiCurrent = PsGetCurrentThreadWin32Thread(); } VOID FASTCALL UserLeave(VOID) { - ASSERT_NOGDILOCKS(); - ASSERT(UserIsEntered()); - ExReleaseResourceLite(&UserLock); - KeLeaveCriticalRegion(); -} + ASSERT_NOGDILOCKS(); + ASSERT(UserIsEntered()); + ExReleaseResourceLite(&UserLock); + KeLeaveCriticalRegion(); +} + +/* EOF */

9 years, 8 months

[dquintana] 65851: [FRAMEDYN] * Actually use the right declaration. Fixes MSVC builds.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Dec 27 14:04:32 2014 New Revision: 65851 URL: http://svn.reactos.org/svn/reactos?rev=65851&view=rev Log: [FRAMEDYN] * Actually use the right declaration. Fixes MSVC builds. Modified: trunk/reactos/include/psdk/provider.h Modified: trunk/reactos/include/psdk/provider.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/provider.h?re… ============================================================================== --- trunk/reactos/include/psdk/provider.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/provider.h [iso-8859-1] Sat Dec 27 14:04:32 2014 @@ -8,11 +8,11 @@ class Provider { -public: - void Flush(); - HRESULT ValidateDeletionFlags(long lFlags); - HRESULT ValidateMethodFlags(long lFlags); - HRESULT ValidateQueryFlags(long lFlags); +protected: + virtual void Flush(); + virtual HRESULT ValidateDeletionFlags(long lFlags); + virtual HRESULT ValidateMethodFlags(long lFlags); + virtual HRESULT ValidateQueryFlags(long lFlags); }; #endif

9 years, 8 months

[pschweitzer] 65850: [NTOSKRNL] Rename IopSecurityFile() to IopGetSetSecurityObject()

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Dec 27 13:46:00 2014 New Revision: 65850 URL: http://svn.reactos.org/svn/reactos?rev=65850&view=rev Log: [NTOSKRNL] Rename IopSecurityFile() to IopGetSetSecurityObject() Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Sat Dec 27 13:46:00 2014 @@ -1164,7 +1164,7 @@ NTSTATUS NTAPI -IopSecurityFile( +IopGetSetSecurityObject( IN PVOID ObjectBody, IN SECURITY_OPERATION_CODE OperationCode, IN PSECURITY_INFORMATION SecurityInformation, Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Sat Dec 27 13:46:00 2014 @@ -1310,14 +1310,14 @@ NTSTATUS NTAPI -IopSecurityFile(IN PVOID ObjectBody, - IN SECURITY_OPERATION_CODE OperationCode, - IN PSECURITY_INFORMATION SecurityInformation, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN OUT PULONG BufferLength, - IN OUT PSECURITY_DESCRIPTOR *OldSecurityDescriptor, - IN POOL_TYPE PoolType, - IN OUT PGENERIC_MAPPING GenericMapping) +IopGetSetSecurityObject(IN PVOID ObjectBody, + IN SECURITY_OPERATION_CODE OperationCode, + IN PSECURITY_INFORMATION SecurityInformation, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PULONG BufferLength, + IN OUT PSECURITY_DESCRIPTOR *OldSecurityDescriptor, + IN POOL_TYPE PoolType, + IN OUT PGENERIC_MAPPING GenericMapping) { IO_STATUS_BLOCK IoStatusBlock; PIO_STACK_LOCATION StackPtr; Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Sat Dec 27 13:46:00 2014 @@ -273,7 +273,7 @@ ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DEVICE_OBJECT); ObjectTypeInitializer.DeleteProcedure = IopDeleteDevice; ObjectTypeInitializer.ParseProcedure = IopParseDevice; - ObjectTypeInitializer.SecurityProcedure = IopSecurityFile; + ObjectTypeInitializer.SecurityProcedure = IopGetSetSecurityObject; ObjectTypeInitializer.CaseInsensitive = TRUE; if (!NT_SUCCESS(ObCreateObjectType(&Name, &ObjectTypeInitializer, @@ -312,7 +312,7 @@ ObjectTypeInitializer.GenericMapping = IopFileMapping; ObjectTypeInitializer.CloseProcedure = IopCloseFile; ObjectTypeInitializer.DeleteProcedure = IopDeleteFile; - ObjectTypeInitializer.SecurityProcedure = IopSecurityFile; + ObjectTypeInitializer.SecurityProcedure = IopGetSetSecurityObject; ObjectTypeInitializer.QueryNameProcedure = IopQueryNameFile; ObjectTypeInitializer.ParseProcedure = IopParseFile; ObjectTypeInitializer.UseDefaultObject = FALSE;

9 years, 8 months

[pschweitzer] 65849: [FRAMEDYN] Partly implement the Provider class from WMI. This allows VMware Tools installer to complain a bit less about imports not found. The installation still fails and sti...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Dec 27 13:33:14 2014 New Revision: 65849 URL: http://svn.reactos.org/svn/reactos?rev=65849&view=rev Log: [FRAMEDYN] Partly implement the Provider class from WMI. This allows VMware Tools installer to complain a bit less about imports not found. The installation still fails and still ends with a BSOD though. CORE-7991 Added: trunk/reactos/dll/win32/framedyn/provider.cpp (with props) trunk/reactos/include/psdk/provider.h (with props) Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt trunk/reactos/dll/win32/framedyn/alias_gcc.s trunk/reactos/dll/win32/framedyn/framedyn.spec Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] Sat Dec 27 13:33:14 2014 @@ -5,6 +5,7 @@ list(APPEND SOURCE main.c chstring.cpp + provider.cpp ${CMAKE_CURRENT_BINARY_DIR}/framedyn.def) if(MSVC) Modified: trunk/reactos/dll/win32/framedyn/alias_gcc.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/alias_g… ============================================================================== --- trunk/reactos/dll/win32/framedyn/alias_gcc.s [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/alias_gcc.s [iso-8859-1] Sat Dec 27 13:33:14 2014 @@ -90,5 +90,9 @@ DEFINE_ALIAS(__ZplRK8CHStringPKw, ??H@YG?AVCHString@@ABV0@PBG@Z) DEFINE_ALIAS(__ZplPKwRK8CHString, ??H@YG?AVCHString@@PBGABV0@@Z) DEFINE_ALIAS(__ZplRK8CHStringS1_, ??H@YG?AVCHString@@ABV0@0@Z) +DEFINE_ALIAS(__ZN8Provider5FlushEv, ?Flush@Provider@@MAEXXZ) +DEFINE_ALIAS(__ZN8Provider21ValidateDeletionFlagsEl, ?ValidateDeletionFlags@Provider@@MAEJJ@Z) +DEFINE_ALIAS(__ZN8Provider19ValidateMethodFlagsEl, ?ValidateMethodFlags@Provider@@MAEJJ@Z) +DEFINE_ALIAS(__ZN8Provider18ValidateQueryFlagsEl, ?ValidateQueryFlags@Provider@@MAEJJ@Z) END Modified: trunk/reactos/dll/win32/framedyn/framedyn.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/framedy… ============================================================================== --- trunk/reactos/dll/win32/framedyn/framedyn.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/framedyn.spec [iso-8859-1] Sat Dec 27 13:33:14 2014 @@ -74,3 +74,7 @@ @ stdcall ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) _ZplRK8CHStringPKw @ stdcall ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) _ZplPKwRK8CHString @ stdcall ??H@YG?AVCHString@@ABV0@0@Z(ptr ptr) _ZplRK8CHStringS1_ +@ thiscall ?Flush@Provider@@MAEXXZ() _ZN8Provider5FlushEv +@ thiscall ?ValidateDeletionFlags@Provider@@MAEJJ@Z(long) _ZN8Provider21ValidateDeletionFlagsEl +@ thiscall ?ValidateMethodFlags@Provider@@MAEJJ@Z(long) _ZN8Provider19ValidateMethodFlagsEl +@ thiscall ?ValidateQueryFlags@Provider@@MAEJJ@Z(long) _ZN8Provider18ValidateQueryFlagsEl Added: trunk/reactos/dll/win32/framedyn/provider.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/provide… ============================================================================== --- trunk/reactos/dll/win32/framedyn/provider.cpp (added) +++ trunk/reactos/dll/win32/framedyn/provider.cpp [iso-8859-1] Sat Dec 27 13:33:14 2014 @@ -0,0 +1,57 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/framedyn/provider.cpp + * PURPOSE: Provider class implementation + * PROGRAMMERS: Pierre Schweitzer (pierre(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <provider.h> +#include <wbemcli.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @unimplemented + */ +void Provider::Flush() +{ + return; +} + +/* + * @implemented + */ +HRESULT Provider::ValidateDeletionFlags(long lFlags) +{ + if (lFlags == 0) + return WBEM_S_NO_ERROR; + + return WBEM_E_UNSUPPORTED_PARAMETER; +} + +/* + * @implemented + */ +HRESULT Provider::ValidateMethodFlags(long lFlags) +{ + if (lFlags == 0) + return WBEM_S_NO_ERROR; + + return WBEM_E_UNSUPPORTED_PARAMETER; +} + +/* + * @implemented + */ +HRESULT Provider::ValidateQueryFlags(long lFlags) +{ + if (lFlags == 0) + return WBEM_S_NO_ERROR; + + return WBEM_E_UNSUPPORTED_PARAMETER; +} Propchange: trunk/reactos/dll/win32/framedyn/provider.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/provider.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/provider.h?re… ============================================================================== --- trunk/reactos/include/psdk/provider.h (added) +++ trunk/reactos/include/psdk/provider.h [iso-8859-1] Sat Dec 27 13:33:14 2014 @@ -0,0 +1,18 @@ +#pragma once + +#ifndef _PROVIDER_H +#define _PROVIDER_H + +#include <windows.h> +#include <provexce.h> + +class Provider +{ +public: + void Flush(); + HRESULT ValidateDeletionFlags(long lFlags); + HRESULT ValidateMethodFlags(long lFlags); + HRESULT ValidateQueryFlags(long lFlags); +}; + +#endif Propchange: trunk/reactos/include/psdk/provider.h ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 8 months

[dreimer] 65848: [RAPPS] Add WINE Mono to RAPPS CORE-8871 #resolve #comment Added to RApps DB.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Dec 27 13:00:03 2014 New Revision: 65848 URL: http://svn.reactos.org/svn/reactos?rev=65848&view=rev Log: [RAPPS] Add WINE Mono to RAPPS CORE-8871 #resolve #comment Added to RApps DB. Added: trunk/reactos/base/applications/rapps/rapps/winemono.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/winemono.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/winemono.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/winemono.txt [iso-8859-1] Sat Dec 27 13:00:03 2014 @@ -0,0 +1,35 @@ +[Section] +Name = Wine Mono .NET Framework +Version = 4.5.4 +License = GPLv2, LGPLv2, MIT, BSD, MS-PL, MPLv1.1 +Description = Wine Mono .NET Framework +Size = 53.7 MB +Category = 14 +URLSite = http://sourceforge.net/projects/wine/files/Wine Mono +URLDownload = http://download.sourceforge.net/wine/Wine%20Mono/4.5.4/wine-mono-4.5.4.msi +CDPath = none + +[Section.0407] +Description = Wine Mono .NET Framework + +[Section.040a] +Description = Wine Mono .NET Framework + +[Section.040c] +Description = Wine Mono .NET Framework +Size = 53,7 Mo + +[Section.0410] +Description = Wine Mono .NET Framework + +[Section.0415] +Description = Wine Mono .NET Framework + +[Section.0418] +Description = Platforma Wine Mono .NET +Size = 53,7 Mo + +[Section.041f] +Name = Wine Mono .NET ÃatÄ±sÄ± +Description = Wine Mono .NET ÃatÄ±sÄ± +Size = 53,7 MB Propchange: trunk/reactos/base/applications/rapps/rapps/winemono.txt ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 8 months

[ekohl] 65847: [USETUP] - Re-enable the partition size check and display a warning if the install partition is too small. - Update the required install partition size to 550MB.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 27 12:33:59 2014 New Revision: 65847 URL: http://svn.reactos.org/svn/reactos?rev=65847&view=rev Log: [USETUP] - Re-enable the partition size check and display a warning if the install partition is too small. - Update the required install partition size to 550MB. Modified: trunk/reactos/base/setup/usetup/errorcode.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/bn-BD.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/base/setup/usetup/errorcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/errorcod… ============================================================================== --- trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -66,7 +66,7 @@ ERROR_UPDATE_LOCALESETTINGS, ERROR_ADDING_KBLAYOUTS, ERROR_UPDATE_GEOID, - ERROR_INSUFFICIENT_DISKSPACE, + ERROR_INSUFFICIENT_PARTITION_SIZE, ERROR_PARTITION_TABLE_FULL, ERROR_ONLY_ONE_EXTENDED, Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1425,36 +1425,25 @@ } -#if 0 static BOOL IsDiskSizeValid(PPARTENTRY PartEntry) { - ULONGLONG m1, m2; - - /* check for unpartitioned space */ - m1 = PartEntry->UnpartitionedLength; - m1 = (m1 + (1 << 19)) >> 20; /* in MBytes (rounded) */ - - if( m1 > RequiredPartitionDiskSpace) + ULONGLONG size; + + size = PartEntry->SectorCount.QuadPart * PartEntry->DiskEntry->BytesPerSector; + size = (size + 524288) / 1048576; /* in MBytes */ + + if (size < RequiredPartitionDiskSpace) + { + /* partition is too small so ask for another partion */ + DPRINT1("Partition is too small (size: %I64u MB), required disk space is %lu MB\n", size, RequiredPartitionDiskSpace); + return FALSE; + } + else { return TRUE; } - - /* check for partitioned space */ - m2 = PartEntry->PartInfo[0].PartitionLength.QuadPart; - m2 = (m2 + (1 << 19)) >> 20; /* in MBytes (rounded) */ - if (m2 < RequiredPartitionDiskSpace) - { - /* partition is too small so ask for another partion */ - DPRINT1("Partition is too small(unpartitioned: %I64u MB, partitioned: %I64u MB), required disk space is %lu MB\n", m1, m2, RequiredPartitionDiskSpace); - return FALSE; - } - else - { - return TRUE; - } -} -#endif +} static PAGE_NUMBER @@ -1513,17 +1502,17 @@ { if (AutoPartition) { -#if 0 - if (!IsDiskSizeValid(PartitionList->CurrentPartition)) - { - MUIDisplayError(ERROR_INSUFFICIENT_DISKSPACE, Ir, POPUP_WAIT_ANY_KEY); - return SELECT_PARTITION_PAGE; /* let the user select another partition */ - } -#endif CreatePrimaryPartition(PartitionList, PartitionList->CurrentPartition->SectorCount.QuadPart, TRUE); + if (!IsDiskSizeValid(PartitionList->CurrentPartition)) + { + MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, + RequiredPartitionDiskSpace); + return SELECT_PARTITION_PAGE; /* let the user select another partition */ + } + DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; return SELECT_FILE_SYSTEM_PAGE; @@ -1531,13 +1520,13 @@ } else { -#if 0 if (!IsDiskSizeValid(PartitionList->CurrentPartition)) { - MUIDisplayError(ERROR_INSUFFICIENT_DISKSPACE, Ir, POPUP_WAIT_ANY_KEY); + MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, + RequiredPartitionDiskSpace); return SELECT_PARTITION_PAGE; /* let the user select another partition */ } -#endif + DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; return SELECT_FILE_SYSTEM_PAGE; @@ -1609,13 +1598,6 @@ } else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { -#if 0 - if (!IsDiskSizeValid(PartitionList->CurrentPartition)) - { - MUIDisplayError(ERROR_INSUFFICIENT_DISKSPACE, Ir, POPUP_WAIT_ANY_KEY); - return SELECT_PARTITION_PAGE; /* let the user select another partition */ - } -#endif if (IsContainerPartition(PartitionList->CurrentPartition->PartitionType)) continue; //return SELECT_PARTITION_PAGE; @@ -1625,6 +1607,13 @@ CreatePrimaryPartition(PartitionList, 0ULL, TRUE); + } + + if (!IsDiskSizeValid(PartitionList->CurrentPartition)) + { + MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, + RequiredPartitionDiskSpace); + return SELECT_PARTITION_PAGE; /* let the user select another partition */ } DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1506,8 +1506,10 @@ "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà " }, { - //ERROR_INSUFFICIENT_DISKSPACE, - " ¨§¡à ¨ï ¤ï« ï¬ ¤®áâ âêç® á¢®¡®¤® ¯à®áâà áâ¢®.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * â¨á¥â¥ ª« ¢¨è, § ¤ ¯à®¤ê«¦¨â¥.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1493,8 +1493,10 @@ "ENTER = Reboot computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1501,8 +1501,10 @@ "ENTER = Restartovat po¡ta" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Na zvolenm odd¡lu nen¡ dost volnho m¡sta.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Pokraujte stisknut¡m libovoln kl vesy.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1497,9 +1497,10 @@ "EINGABETASTE = Computer neu starten" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Es ist nicht gengend Speicherplatz auf der\n" - "gewhlten Partition vorhanden.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "Die gewhlten Partition ist nicht groá genug, um ReactOS zu installieren.\n" + "Die Installationspartition muss mindestens %lu MB groá sein.\n" + "\n" " * Eine beliebige Taste zum Fortsetzen drcken.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1493,8 +1493,10 @@ "ENTER = Reboot computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1501,8 +1501,10 @@ "ENTER = Reiniciar el equipo" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "No hay suficiente espacio disponible en la partici¢n seleccionada.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Presione una tecla para continuar.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1491,8 +1491,10 @@ "ENTER = Taaskivita arvuti" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Valitud partitsioonil pole piisavalt ruumi.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Vajuta suvalist klahvi, et jtkata.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1506,8 +1506,10 @@ "ENTRE = Redmarrer l'ordinateur" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Pas assez d'espace libre dans la partition slectionne.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Appuyer sur une touche pour continuer.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1494,8 +1494,10 @@ "ENTER = Reboot computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1495,8 +1495,10 @@ "INVIO = Riavviare il computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Lo spazio disponibile nella partizione selezionata insufficiente.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Premere un tasto qualsiasi per continuare.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1495,8 +1495,10 @@ "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1503,8 +1503,10 @@ "ENTER = Reboot computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1539,8 +1539,10 @@ "ENTER = Computer opnieuw opstarten" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Onvoldoende vrije ruimte in de geselecteerde partitie.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Druk op een toets om door te gaan.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1503,8 +1503,10 @@ "ENTER = Restart komputera" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Brak wystarczaj¥cej wolnej przestrzeni w wybranej partycji.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Nacinij dowolny klawisz, aby kontynuowa.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1531,8 +1531,10 @@ "ENTER=Reiniciar" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "NÆo h espao suficiente na partiÆo selecionada.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Pressione qualquer tecla para continuar.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1570,9 +1570,10 @@ "ENTER = Repornire calculator" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Pe partiîia selectatÇ nu existÇ suficient\n" - "spaîiu liber." + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Tastaîi pentru a continua.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1495,8 +1495,10 @@ "ENTER = Reboot computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1505,8 +1505,10 @@ "ENTER = Reçtart po¡taa" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Na zvolenej part¡cii nie je dostatok vonho miesta.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Pokraujte stlaen¡m ubovonho kl vesu.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1498,8 +1498,10 @@ "ENTER = Ristarto kompjuterin" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Jo mjaft hapesir e lir n particionin e przgjedhur.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Shtypni nj tast cfardo pr t vazhduar.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1501,8 +1501,10 @@ "ENTER = Starta om datorn" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Inte tillrckligt mycket fritt utrymme p den valda partitionen.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Tryck valfri tangent fr att fortstta.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1481,8 +1481,10 @@ "Giri = Bilgisayar Yeniden Balat" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Seili blmde yeterli bo alan yok.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Srdrmek iin bir d§meye basnz.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1501,8 +1501,10 @@ "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "¥¤®áâ âì® ¢i«ì®£® ¬iáæï ®¡à ®¬ã à®§¤i«i.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * â¨áiâì ¡ã¤ì-ïªã ª« ¢ièã ¤«ï ¯à®¤®¢¦¥ï.", NULL }, Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -213,9 +213,12 @@ MUIDisplayError( IN ULONG ErrorNum, OUT PINPUT_RECORD Ir, - IN ULONG WaitEvent) + IN ULONG WaitEvent, + ...) { const MUI_ERROR * entry; + CHAR Buffer[2048]; + va_list ap; if (ErrorNum >= ERROR_LAST_ERROR_CODE) { @@ -237,7 +240,11 @@ return; } - PopupError(entry[ErrorNum].ErrorText, + va_start(ap, WaitEvent); + vsprintf(Buffer, entry[ErrorNum].ErrorText, ap); + va_end(ap); + + PopupError(Buffer, entry[ErrorNum].ErrorStatus, Ir, WaitEvent); Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -69,7 +69,8 @@ MUIDisplayError( ULONG ErrorNum, PINPUT_RECORD Ir, - ULONG WaitEvent); + ULONG WaitEvent, + ...); LPCWSTR MUIDefaultKeyboardLayout(VOID); Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -13,7 +13,7 @@ [DiskSpaceRequirements] ; Required free system partition disk space in MB -FreeSysPartDiskSpace=350 +FreeSysPartDiskSpace=550 [SourceDisksFiles] acpi.sys=,,,,,,,,,,,,4

9 years, 8 months

← Newer
1
...
5
6
7
8
9
10
11
...
39
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 December 2014