Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 65015: [NTVDM]: No need to re-change to a given video mode when it is already set. Fixes strange changes for e.g. some apps that find intelligent to switch 256 times to mode 13h (for exa...
by hbelusca＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: hbelusca Date: Sun Oct 26 15:57:21 2014 New Revision: 65015 URL: http://svn.reactos.org/svn/reactos?rev=65015&view=rev Log: [NTVDM]: No need to re-change to a given video mode when it is already set. Fixes strange changes for e.g. some apps that find intelligent to switch 256 times to mode 13h (for example) before continuing to run. Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Sun Oct 26 15:57:21 2014 @@ -2308,6 +2308,9 @@ return FALSE; } + /* Check if this is the same mode */ + if (ModeNumber == Bda->VideoMode) return TRUE; + VgaMode = VideoModes[ModeNumber]; DPRINT1("Switching to mode %02Xh %s clearing the screen; VgaMode = 0x%p\n",

1 0

[pschweitzer] 65014: [FASTFAT] Make FATGetNextDirEntry() and vfatFindDirSpace() complain when they are given a cleaned up FCB (which shouldn't happen!). They'll display full path, references count, ...
by pschweitzer＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: pschweitzer Date: Sun Oct 26 15:56:20 2014 New Revision: 65014 URL: http://svn.reactos.org/svn/reactos?rev=65014&view=rev Log: [FASTFAT] Make FATGetNextDirEntry() and vfatFindDirSpace() complain when they are given a cleaned up FCB (which shouldn't happen!). They'll display full path, references count, open handles count. Where are you little reference leak? Modified: trunk/reactos/drivers/filesystems/fastfat/direntry.c trunk/reactos/drivers/filesystems/fastfat/dirwr.c Modified: trunk/reactos/drivers/filesystems/fastfat/direntry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/direntry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/direntry.c [iso-8859-1] Sun Oct 26 15:56:20 2014 @@ -201,6 +201,12 @@ CcUnpinData(*pContext); } + if (!pDirFcb->FileObject) + { + DPRINT1("Buggy FCB (cleaned up)! %S (%d / %u)\n", pDirFcb->PathNameBuffer, pDirFcb->RefCount, pDirFcb->OpenHandleCount); + return STATUS_NO_MORE_ENTRIES; + } + if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart || !CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) { Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] Sun Oct 26 15:56:20 2014 @@ -166,6 +166,11 @@ if (Context) { CcUnpinData(Context); + } + if (!pDirFcb->FileObject) + { + DPRINT1("Buggy FCB (cleaned up)! %S (%d / %u)\n", pDirFcb->PathNameBuffer, pDirFcb->RefCount, pDirFcb->OpenHandleCount); + return FALSE; } if (!CcPinRead(pDirFcb->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, TRUE, &Context, (PVOID*)&pFatEntry))

1 0

[pschweitzer] 65013: [FASTFAT] Don't leak reference on failure in vfatPrepareTargetForRename().
by pschweitzer＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: pschweitzer Date: Sun Oct 26 15:35:18 2014 New Revision: 65013 URL: http://svn.reactos.org/svn/reactos?rev=65013&view=rev Log: [FASTFAT] Don't leak reference on failure in vfatPrepareTargetForRename(). Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Sun Oct 26 15:35:18 2014 @@ -400,6 +400,7 @@ /* If that's a directory or a read-only file, we're not allowed */ if (vfatFCBIsDirectory(TargetFcb) || ((*TargetFcb->Attributes & FILE_ATTRIBUTE_READONLY) == FILE_ATTRIBUTE_READONLY)); { + vfatReleaseFCB(DeviceExt, *ParentFCB); *ParentFCB = NULL; vfatReleaseFCB(DeviceExt, TargetFcb); return STATUS_OBJECT_NAME_COLLISION; @@ -408,6 +409,7 @@ /* Attempt to flush (might close the file) */ if (!MmFlushImageSection(TargetFcb->FileObject->SectionObjectPointer, MmFlushForDelete)) { + vfatReleaseFCB(DeviceExt, *ParentFCB); *ParentFCB = NULL; vfatReleaseFCB(DeviceExt, TargetFcb); return STATUS_ACCESS_DENIED; @@ -416,6 +418,7 @@ /* If we are, ensure the file isn't open by anyone! */ if (TargetFcb->OpenHandleCount != 0) { + vfatReleaseFCB(DeviceExt, *ParentFCB); *ParentFCB = NULL; vfatReleaseFCB(DeviceExt, TargetFcb); return STATUS_ACCESS_DENIED; @@ -429,6 +432,7 @@ } else { + vfatReleaseFCB(DeviceExt, *ParentFCB); *ParentFCB = NULL; vfatReleaseFCB(DeviceExt, TargetFcb); return STATUS_OBJECT_NAME_COLLISION;

1 0

[hbelusca] 65012: [NTVDM]: Return the latched data for keyboard ps/2 port only. Also when starting an app put a ENTER key release into the keyboard buffer because some apps expect it.
by hbelusca＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: hbelusca Date: Sun Oct 26 15:01:14 2014 New Revision: 65012 URL: http://svn.reactos.org/svn/reactos?rev=65012&view=rev Log: [NTVDM]: Return the latched data for keyboard ps/2 port only. Also when starting an app put a ENTER key release into the keyboard buffer because some apps expect it. Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/ntvdm/hardware/keyboard.c trunk/reactos/subsystems/ntvdm/hardware/ps2.c Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sun Oct 26 15:01:14 2014 @@ -19,6 +19,9 @@ #include "dos/dem.h" #include "bios/bios.h" + +#include "io.h" +#include "hardware/ps2.h" /* PRIVATE VARIABLES **********************************************************/ @@ -1164,6 +1167,12 @@ /* Attach to the console */ VidBiosAttachToConsole(); // FIXME: And in fact, attach the full NTVDM UI to the console + // HACK: Simulate a ENTER key release scancode on the PS/2 port because + // some apps expect to read a key release scancode (> 0x80) when they + // are started. + IOWriteB(PS2_CONTROL_PORT, 0xD2); // Next write is for the first PS/2 port + IOWriteB(PS2_DATA_PORT, 0x80 | 0x1C); // ENTER key release + /* Start simulation */ SetEvent(VdmTaskEvent); CpuSimulate(); Modified: trunk/reactos/subsystems/ntvdm/hardware/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/keyboard.c [iso-8859-1] Sun Oct 26 15:01:14 2014 @@ -47,7 +47,7 @@ BOOLEAN KeyboardInit(BYTE PS2Connector) { - /* Finish to plug the mouse to the specified PS/2 port */ + /* Finish to plug the keyboard to the specified PS/2 port */ PS2Port = PS2Connector; PS2SetDeviceCmdProc(PS2Port, NULL, KeyboardCommand); Modified: trunk/reactos/subsystems/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] Sun Oct 26 15:01:14 2014 @@ -80,11 +80,14 @@ if (StatusRegister & (1 << 0)) // || StatusRegister & (1 << 5) for second PS/2 port StatusRegister &= ~(1 << 0); // StatusRegister &= ~(1 << 5); + // FIXME: We may check there whether there is data latched in + // PS2 ports 1 or 2 (keyboard or mouse) and retrieve it there... + /* Always return the available byte stored in the output buffer */ return OutputBuffer; } - return 0; + return 0x00; } static VOID WINAPI PS2WritePort(USHORT Port, BYTE Data) @@ -270,7 +273,18 @@ if (!Port->IsEnabled) return FALSE; /* Make sure the queue is not empty (fast check) */ - if (Port->QueueEmpty) return FALSE; + if (Port->QueueEmpty) + { + /* Only the keyboard should have its last data latched */ + // FIXME: Alternatively this can be done in PS2ReadPort when + // we read PS2_DATA_PORT. What is the best solution?? + if (PS2Port == 0) + { + OutputBuffer = Port->Queue[(Port->QueueStart - 1) % BUFFER_SIZE]; + } + + return FALSE; + } WaitForSingleObject(Port->QueueMutex, INFINITE); @@ -337,7 +351,7 @@ Port->QueueEnd++; Port->QueueEnd %= BUFFER_SIZE; - /* Since we inserted a value, it's not empty anymore */ + /* The queue is not empty anymore */ Port->QueueEmpty = FALSE; /*

1 0

[aandrejevic] 65011: [NTVDM] Signal the next IRQ on EOI.
by aandrejevic＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: aandrejevic Date: Sun Oct 26 14:57:44 2014 New Revision: 65011 URL: http://svn.reactos.org/svn/reactos?rev=65011&view=rev Log: [NTVDM] Signal the next IRQ on EOI. Modified: trunk/reactos/subsystems/ntvdm/hardware/pic.c Modified: trunk/reactos/subsystems/ntvdm/hardware/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/pic.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/pic.c [iso-8859-1] Sun Oct 26 14:57:44 2014 @@ -84,6 +84,12 @@ { /* Otherwise, clear all of them */ Pic->InServiceRegister = 0; + } + + if (MasterPic.IntRequestRegister || SlavePic.IntRequestRegister) + { + /* Signal the next IRQ */ + EmulatorInterruptSignal(); } } }

1 0

[akhaldi] 65010: [ADVAPI32] * Import ADVAPI_GetComputerSid from Wine 1.7.27. * Apply Wine commit f7a6c4c3 by Detlef Riekenberg: Allow string alias for common RID in sid strings. CORE-8540
by akhaldi＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: akhaldi Date: Sun Oct 26 11:55:05 2014 New Revision: 65010 URL: http://svn.reactos.org/svn/reactos?rev=65010&view=rev Log: [ADVAPI32] * Import ADVAPI_GetComputerSid from Wine 1.7.27. * Apply Wine commit f7a6c4c3 by Detlef Riekenberg: Allow string alias for common RID in sid strings. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c 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] Sun Oct 26 11:55:05 2014 @@ -115,26 +115,28 @@ { {'S','I'}, WinSystemLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_SYSTEM_RID } } }, }; +/* these SIDs must be constructed as relative to some domain - only the RID is well-known */ typedef struct WELLKNOWNRID { + WCHAR wstr[2]; WELL_KNOWN_SID_TYPE Type; DWORD Rid; } WELLKNOWNRID; static const WELLKNOWNRID WellKnownRids[] = { - { WinAccountAdministratorSid, DOMAIN_USER_RID_ADMIN }, - { WinAccountGuestSid, DOMAIN_USER_RID_GUEST }, - { WinAccountKrbtgtSid, DOMAIN_USER_RID_KRBTGT }, - { WinAccountDomainAdminsSid, DOMAIN_GROUP_RID_ADMINS }, - { WinAccountDomainUsersSid, DOMAIN_GROUP_RID_USERS }, - { WinAccountDomainGuestsSid, DOMAIN_GROUP_RID_GUESTS }, - { WinAccountComputersSid, DOMAIN_GROUP_RID_COMPUTERS }, - { WinAccountControllersSid, DOMAIN_GROUP_RID_CONTROLLERS }, - { WinAccountCertAdminsSid, DOMAIN_GROUP_RID_CERT_ADMINS }, - { WinAccountSchemaAdminsSid, DOMAIN_GROUP_RID_SCHEMA_ADMINS }, - { WinAccountEnterpriseAdminsSid, DOMAIN_GROUP_RID_ENTERPRISE_ADMINS }, - { WinAccountPolicyAdminsSid, DOMAIN_GROUP_RID_POLICY_ADMINS }, - { WinAccountRasAndIasServersSid, DOMAIN_ALIAS_RID_RAS_SERVERS }, + { {'L','A'}, WinAccountAdministratorSid, DOMAIN_USER_RID_ADMIN }, + { {'L','G'}, WinAccountGuestSid, DOMAIN_USER_RID_GUEST }, + { {0,0}, WinAccountKrbtgtSid, DOMAIN_USER_RID_KRBTGT }, + { {0,0}, WinAccountDomainAdminsSid, DOMAIN_GROUP_RID_ADMINS }, + { {0,0}, WinAccountDomainUsersSid, DOMAIN_GROUP_RID_USERS }, + { {0,0}, WinAccountDomainGuestsSid, DOMAIN_GROUP_RID_GUESTS }, + { {0,0}, WinAccountComputersSid, DOMAIN_GROUP_RID_COMPUTERS }, + { {0,0}, WinAccountControllersSid, DOMAIN_GROUP_RID_CONTROLLERS }, + { {0,0}, WinAccountCertAdminsSid, DOMAIN_GROUP_RID_CERT_ADMINS }, + { {0,0}, WinAccountSchemaAdminsSid, DOMAIN_GROUP_RID_SCHEMA_ADMINS }, + { {0,0}, WinAccountEnterpriseAdminsSid, DOMAIN_GROUP_RID_ENTERPRISE_ADMINS }, + { {0,0}, WinAccountPolicyAdminsSid, DOMAIN_GROUP_RID_POLICY_ADMINS }, + { {0,0}, WinAccountRasAndIasServersSid, DOMAIN_ALIAS_RID_RAS_SERVERS }, }; static const SID sidWorld = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; @@ -301,6 +303,24 @@ return Result; } +/************************************************************ + * ADVAPI_GetComputerSid + */ +BOOL ADVAPI_GetComputerSid(PSID sid) +{ + static const struct /* same fields as struct SID */ + { + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[4]; + } computer_sid = + { SID_REVISION, 4, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0 } }; + + memcpy( sid, &computer_sid, sizeof(computer_sid) ); + return TRUE; +} + /* Exported functions */ /* @@ -3621,6 +3641,15 @@ for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) return GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); + + for (i = 0; i < sizeof(WellKnownRids)/sizeof(WellKnownRids[0]); i++) + if (!strncmpW(WellKnownRids[i].wstr, StringSid, 2)) + { + MAX_SID local; + ADVAPI_GetComputerSid(&local); + return GetSidLengthRequired(*GetSidSubAuthorityCount(&local) + 1); + } + } return GetSidLengthRequired(0); @@ -3648,7 +3677,7 @@ *cBytes = ComputeStringSidSize(StringSid); if (!pisid) /* Simply compute the size */ { - TRACE("only size requested, returning TRUE\n"); + TRACE("only size requested, returning TRUE with %d\n", *cBytes); return TRUE; } @@ -3727,6 +3756,15 @@ bret = TRUE; } + for (i = 0; i < sizeof(WellKnownRids)/sizeof(WellKnownRids[0]); i++) + if (!strncmpW(WellKnownRids[i].wstr, StringSid, 2)) + { + ADVAPI_GetComputerSid(pisid); + pisid->SubAuthority[pisid->SubAuthorityCount] = WellKnownRids[i].Rid; + pisid->SubAuthorityCount++; + bret = TRUE; + } + if (!bret) FIXME("String constant not supported: %s\n", debugstr_wn(StringSid, 2)); }

1 0

[hbelusca] 65009: [FAST486][NTVDM]: Do not compile some FPU functions when FAST486_NO_FPU is defined (fixes build).
by hbelusca＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: hbelusca Date: Sun Oct 26 11:50:14 2014 New Revision: 65009 URL: http://svn.reactos.org/svn/reactos?rev=65009&view=rev Log: [FAST486][NTVDM]: Do not compile some FPU functions when FAST486_NO_FPU is defined (fixes build). Modified: trunk/reactos/lib/fast486/fpu.c trunk/reactos/subsystems/ntvdm/cpu/registers.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6500… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sun Oct 26 11:50:14 2014 @@ -32,6 +32,8 @@ /* PRIVATE FUNCTIONS **********************************************************/ +#ifndef FAST486_NO_FPU + static ULONGLONG UnsignedMult128(ULONGLONG Multiplicand, ULONGLONG Multiplier, @@ -302,6 +304,8 @@ UNREFERENCED_PARAMETER(TempResult); UNIMPLEMENTED; } + +#endif /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/subsystems/ntvdm/cpu/registers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/cpu/regis… ============================================================================== --- trunk/reactos/subsystems/ntvdm/cpu/registers.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/cpu/registers.c [iso-8859-1] Sun Oct 26 11:50:14 2014 @@ -39,6 +39,7 @@ IntelRegPtr.Dr7 = EmulatorContext.DebugRegisters[FAST486_REG_DR7]; } +#ifndef FAST486_NO_FPU if (IntelRegPtr.ContextFlags & CONTEXT_FLOATING_POINT) { // IntelRegPtr.FloatSave = ; @@ -52,6 +53,7 @@ // IntelRegPtr.FloatSave.RegisterArea = ; // This is a region of size SIZE_OF_80387_REGISTERS == 80 bytes // IntelRegPtr.FloatSave.Cr0NpxState = ; } +#endif if (IntelRegPtr.ContextFlags & CONTEXT_SEGMENTS) {

1 0

[akhaldi] 65008: [ADVAPI32] * Reorder AceRights to reduce difference to Wine. CORE-8540
by akhaldi＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: akhaldi Date: Sun Oct 26 11:47:29 2014 New Revision: 65008 URL: http://svn.reactos.org/svn/reactos?rev=65008&view=rev Log: [ADVAPI32] * Reorder AceRights to reduce difference to Wine. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c 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] Sun Oct 26 11:47:29 2014 @@ -226,40 +226,6 @@ return "(too-big)"; } -static const ACEFLAG AceRights[] = -{ - { SDDL_GENERIC_ALL, GENERIC_ALL }, - { SDDL_GENERIC_READ, GENERIC_READ }, - { SDDL_GENERIC_WRITE, GENERIC_WRITE }, - { SDDL_GENERIC_EXECUTE, GENERIC_EXECUTE }, - - { SDDL_READ_CONTROL, READ_CONTROL }, - { SDDL_STANDARD_DELETE, DELETE }, - { SDDL_WRITE_DAC, WRITE_DAC }, - { SDDL_WRITE_OWNER, WRITE_OWNER }, - - { SDDL_READ_PROPERTY, ADS_RIGHT_DS_READ_PROP}, - { SDDL_WRITE_PROPERTY, ADS_RIGHT_DS_WRITE_PROP}, - { SDDL_CREATE_CHILD, ADS_RIGHT_DS_CREATE_CHILD}, - { SDDL_DELETE_CHILD, ADS_RIGHT_DS_DELETE_CHILD}, - { SDDL_LIST_CHILDREN, ADS_RIGHT_ACTRL_DS_LIST}, - { SDDL_SELF_WRITE, ADS_RIGHT_DS_SELF}, - { SDDL_LIST_OBJECT, ADS_RIGHT_DS_LIST_OBJECT}, - { SDDL_DELETE_TREE, ADS_RIGHT_DS_DELETE_TREE}, - { SDDL_CONTROL_ACCESS, ADS_RIGHT_DS_CONTROL_ACCESS}, - - { SDDL_FILE_ALL, FILE_ALL_ACCESS }, - { SDDL_FILE_READ, FILE_GENERIC_READ }, - { SDDL_FILE_WRITE, FILE_GENERIC_WRITE }, - { SDDL_FILE_EXECUTE, FILE_GENERIC_EXECUTE }, - - { SDDL_KEY_ALL, KEY_ALL_ACCESS }, - { SDDL_KEY_READ, KEY_READ }, - { SDDL_KEY_WRITE, KEY_WRITE }, - { SDDL_KEY_EXECUTE, KEY_EXECUTE }, - { NULL, 0 }, -}; - /* set last error code from NT status and get the proper boolean return value */ /* used for functions that are a simple wrapper around the corresponding ntdll API */ static __inline BOOL set_ntstatus( NTSTATUS status ) @@ -2399,6 +2365,40 @@ /****************************************************************************** * ParseAceStringRights */ +static const ACEFLAG AceRights[] = +{ + { SDDL_GENERIC_ALL, GENERIC_ALL }, + { SDDL_GENERIC_READ, GENERIC_READ }, + { SDDL_GENERIC_WRITE, GENERIC_WRITE }, + { SDDL_GENERIC_EXECUTE, GENERIC_EXECUTE }, + + { SDDL_READ_CONTROL, READ_CONTROL }, + { SDDL_STANDARD_DELETE, DELETE }, + { SDDL_WRITE_DAC, WRITE_DAC }, + { SDDL_WRITE_OWNER, WRITE_OWNER }, + + { SDDL_READ_PROPERTY, ADS_RIGHT_DS_READ_PROP}, + { SDDL_WRITE_PROPERTY, ADS_RIGHT_DS_WRITE_PROP}, + { SDDL_CREATE_CHILD, ADS_RIGHT_DS_CREATE_CHILD}, + { SDDL_DELETE_CHILD, ADS_RIGHT_DS_DELETE_CHILD}, + { SDDL_LIST_CHILDREN, ADS_RIGHT_ACTRL_DS_LIST}, + { SDDL_SELF_WRITE, ADS_RIGHT_DS_SELF}, + { SDDL_LIST_OBJECT, ADS_RIGHT_DS_LIST_OBJECT}, + { SDDL_DELETE_TREE, ADS_RIGHT_DS_DELETE_TREE}, + { SDDL_CONTROL_ACCESS, ADS_RIGHT_DS_CONTROL_ACCESS}, + + { SDDL_FILE_ALL, FILE_ALL_ACCESS }, + { SDDL_FILE_READ, FILE_GENERIC_READ }, + { SDDL_FILE_WRITE, FILE_GENERIC_WRITE }, + { SDDL_FILE_EXECUTE, FILE_GENERIC_EXECUTE }, + + { SDDL_KEY_ALL, KEY_ALL_ACCESS }, + { SDDL_KEY_READ, KEY_READ }, + { SDDL_KEY_WRITE, KEY_WRITE }, + { SDDL_KEY_EXECUTE, KEY_EXECUTE }, + { NULL, 0 }, +}; + static DWORD ParseAceStringRights(LPCWSTR* StringAcl) { UINT len = 0;

1 0

[akhaldi] 65007: [ADVAPI32] * Apply Wine commit e57edfea by Paul Vriens: Skip leading spaces when parsing. * Update the related functions with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: akhaldi Date: Sun Oct 26 10:59:11 2014 New Revision: 65007 URL: http://svn.reactos.org/svn/reactos?rev=65007&view=rev Log: [ADVAPI32] * Apply Wine commit e57edfea by Paul Vriens: Skip leading spaces when parsing. * Update the related functions with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c 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] Sun Oct 26 10:59:11 2014 @@ -2335,6 +2335,9 @@ LPCWSTR szAcl = *StringAcl; const ACEFLAG *lpaf = AceType; + while (*szAcl == ' ') + szAcl++; + while (lpaf->wstr && (len = strlenW(lpaf->wstr)) && strncmpW(lpaf->wstr, szAcl, len)) @@ -2343,7 +2346,7 @@ if (!lpaf->wstr) return 0; - *StringAcl += len; + *StringAcl = szAcl + len; return lpaf->value; } @@ -2369,6 +2372,9 @@ BYTE flags = 0; LPCWSTR szAcl = *StringAcl; + while (*szAcl == ' ') + szAcl++; + while (*szAcl != ';') { const ACEFLAG *lpaf = AceFlags; @@ -2381,7 +2387,7 @@ if (!lpaf->wstr) return 0; - flags |= lpaf->value; + flags |= lpaf->value; szAcl += len; } @@ -2399,19 +2405,22 @@ DWORD rights = 0; LPCWSTR szAcl = *StringAcl; + while (*szAcl == ' ') + szAcl++; + if ((*szAcl == '0') && (*(szAcl + 1) == 'x')) { LPCWSTR p = szAcl; - while (*p && *p != ';') + while (*p && *p != ';') p++; - if (p - szAcl <= 10 /* 8 hex digits + "0x" */ ) - { - rights = strtoulW(szAcl, NULL, 16); - szAcl = p; - } - else + if (p - szAcl <= 10 /* 8 hex digits + "0x" */ ) + { + rights = strtoulW(szAcl, NULL, 16); + szAcl = p; + } + else WARN("Invalid rights string format: %s\n", debugstr_wn(szAcl, p - szAcl)); } else @@ -2421,16 +2430,16 @@ const ACEFLAG *lpaf = AceRights; while (lpaf->wstr && - (len = strlenW(lpaf->wstr)) && - strncmpW(lpaf->wstr, szAcl, len)) - { - lpaf++; - } + (len = strlenW(lpaf->wstr)) && + strncmpW(lpaf->wstr, szAcl, len)) + { + lpaf++; + } if (!lpaf->wstr) return 0; - rights |= lpaf->value; + rights |= lpaf->value; szAcl += len; } } @@ -2445,11 +2454,8 @@ * * dacl_flags(string_ace1)(string_ace2)... (string_acen) */ -static BOOL -ParseStringAclToAcl(LPCWSTR StringAcl, - LPDWORD lpdwFlags, - PACL pAcl, - LPDWORD cBytes) +static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, + PACL pAcl, LPDWORD cBytes) { DWORD val; DWORD sidlen; @@ -2457,11 +2463,12 @@ DWORD acesize = 0; DWORD acecount = 0; PACCESS_ALLOWED_ACE pAce = NULL; /* pointer to current ACE */ + DWORD error = ERROR_INVALID_ACL; TRACE("%s\n", debugstr_w(StringAcl)); if (!StringAcl) - return FALSE; + return FALSE; if (pAcl) /* pAce is only useful if we're setting values */ pAce = (PACCESS_ALLOWED_ACE) (pAcl + 1); @@ -2476,29 +2483,34 @@ /* Parse ACE type */ val = ParseAceStringType(&StringAcl); - if (pAce) + if (pAce) pAce->Header.AceType = (BYTE) val; if (*StringAcl != ';') + { + error = RPC_S_INVALID_STRING_UUID; goto lerr; + } StringAcl++; /* Parse ACE flags */ - val = ParseAceStringFlags(&StringAcl); - if (pAce) + val = ParseAceStringFlags(&StringAcl); + if (pAce) pAce->Header.AceFlags = (BYTE) val; if (*StringAcl != ';') goto lerr; StringAcl++; /* Parse ACE rights */ - val = ParseAceStringRights(&StringAcl); - if (pAce) + val = ParseAceStringRights(&StringAcl); + if (pAce) pAce->Mask = val; if (*StringAcl != ';') goto lerr; StringAcl++; /* Parse ACE object guid */ + while (*StringAcl == ' ') + StringAcl++; if (*StringAcl != ';') { FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); @@ -2507,6 +2519,8 @@ StringAcl++; /* Parse ACE inherit object guid */ + while (*StringAcl == ' ') + StringAcl++; if (*StringAcl != ';') { FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); @@ -2516,10 +2530,10 @@ /* Parse ACE account sid */ if (ParseStringSidToSid(StringAcl, pAce ? &pAce->SidStart : NULL, &sidlen)) - { + { while (*StringAcl && *StringAcl != ')') StringAcl++; - } + } if (*StringAcl != ')') goto lerr; @@ -2554,7 +2568,7 @@ return TRUE; lerr: - SetLastError(ERROR_INVALID_ACL); + SetLastError(error); WARN("Invalid ACE string format\n"); return FALSE; } @@ -2563,10 +2577,10 @@ /****************************************************************************** * ParseStringSecurityDescriptorToSecurityDescriptor */ -static BOOL -ParseStringSecurityDescriptorToSecurityDescriptor(LPCWSTR StringSecurityDescriptor, - SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor, - LPDWORD cBytes) +static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( + LPCWSTR StringSecurityDescriptor, + SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor, + LPDWORD cBytes) { BOOL bret = FALSE; WCHAR toktype; @@ -2580,25 +2594,28 @@ if (SecurityDescriptor) lpNext = (LPBYTE)(SecurityDescriptor + 1); + while (*StringSecurityDescriptor == ' ') + StringSecurityDescriptor++; + while (*StringSecurityDescriptor) { toktype = *StringSecurityDescriptor; - /* Expect char identifier followed by ':' */ - StringSecurityDescriptor++; + /* Expect char identifier followed by ':' */ + StringSecurityDescriptor++; if (*StringSecurityDescriptor != ':') { SetLastError(ERROR_INVALID_PARAMETER); goto lend; } - StringSecurityDescriptor++; - - /* Extract token */ - lptoken = StringSecurityDescriptor; - while (*lptoken && *lptoken != ':') + StringSecurityDescriptor++; + + /* Extract token */ + lptoken = StringSecurityDescriptor; + while (*lptoken && *lptoken != ':') lptoken++; - if (*lptoken) + if (*lptoken) lptoken--; len = lptoken - StringSecurityDescriptor; @@ -2606,7 +2623,7 @@ tok[len] = 0; switch (toktype) - { + { case 'O': { DWORD bytes; @@ -2620,7 +2637,7 @@ lpNext += bytes; /* Advance to next token */ } - *cBytes += bytes; + *cBytes += bytes; break; } @@ -2638,13 +2655,13 @@ lpNext += bytes; /* Advance to next token */ } - *cBytes += bytes; + *cBytes += bytes; break; } case 'D': - { + { DWORD flags; DWORD bytes; @@ -2656,11 +2673,11 @@ SecurityDescriptor->Control |= SE_DACL_PRESENT | flags; SecurityDescriptor->Dacl = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ - } - - *cBytes += bytes; - - break; + } + + *cBytes += bytes; + + break; } case 'S': @@ -2676,18 +2693,18 @@ SecurityDescriptor->Control |= SE_SACL_PRESENT | flags; SecurityDescriptor->Sacl = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ - } - - *cBytes += bytes; - - break; + } + + *cBytes += bytes; + + break; } default: FIXME("Unknown token\n"); SetLastError(ERROR_INVALID_PARAMETER); - goto lend; - } + goto lend; + } StringSecurityDescriptor = lptoken; }

1 0

[akhaldi] 65006: [ADVAPI32] * Update CopySid(). CORE-8540
by akhaldi＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: akhaldi Date: Sun Oct 26 10:34:40 2014 New Revision: 65006 URL: http://svn.reactos.org/svn/reactos?rev=65006&view=rev Log: [ADVAPI32] * Update CopySid(). CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c 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] Sun Oct 26 10:34:40 2014 @@ -627,26 +627,18 @@ return RtlFreeSid(pSid); } -/* - * @implemented +/****************************************************************************** + * CopySid [ADVAPI32.@] + * + * PARAMS + * nDestinationSidLength [] + * pDestinationSid [] + * pSourceSid [] */ BOOL WINAPI -CopySid(DWORD nDestinationSidLength, - PSID pDestinationSid, - PSID pSourceSid) -{ - NTSTATUS Status; - - Status = RtlCopySid(nDestinationSidLength, - pDestinationSid, - pSourceSid); - if (!NT_SUCCESS (Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; +CopySid( DWORD nDestinationSidLength, PSID pDestinationSid, PSID pSourceSid ) +{ + return set_ntstatus(RtlCopySid(nDestinationSidLength, pDestinationSid, pSourceSid)); } /*

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs