Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 49169: [RTL]: Fix a bug introduced Mon Dec 6 00:25:14 1999 UTC (10 years, 10 months ago) in revision 828. NtFreeVirtualMemory takes a pointer to the address to free, not the address i...
by sir_richard＠svn.reactos.org 16 Oct '10

16 Oct '10

Author: sir_richard Date: Sat Oct 16 14:20:30 2010 New Revision: 49169 URL: http://svn.reactos.org/svn/reactos?rev=49169&view=rev Log: [RTL]: Fix a bug introduced Mon Dec 6 00:25:14 1999 UTC (10 years, 10 months ago) in revision 828. NtFreeVirtualMemory takes a pointer to the address to free, not the address instead. For the last 11 years, freeing the process parameter block resulted in freeing whatever the first value in the structure is, which is MaximumLength and initialized to 0x1000. ReactOS would then free whatever random address was in that area. In real Windows, it is illegal to free an allocation in the middle of the base address, and this call failed with the new VAD code. ReactOS either leaked the memory or freed random data, who knows. [RTL]: Make the PPB live in the Heap instead of having its own virtual allocation, fixing the issue above. Stop rounding it to a PAGE_SIZE, and just use the space required. Modified: trunk/reactos/lib/rtl/ppb.c Modified: trunk/reactos/lib/rtl/ppb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/ppb.c?rev=49169&r1… ============================================================================== --- trunk/reactos/lib/rtl/ppb.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/ppb.c [iso-8859-1] Sat Oct 16 14:20:30 2010 @@ -53,9 +53,7 @@ PUNICODE_STRING ShellInfo, PUNICODE_STRING RuntimeData) { - NTSTATUS Status = STATUS_SUCCESS; PRTL_USER_PROCESS_PARAMETERS Param = NULL; - SIZE_T RegionSize = 0; ULONG Length = 0; PWCHAR Dest; UNICODE_STRING EmptyString; @@ -121,23 +119,16 @@ Length += ALIGN(RuntimeData->MaximumLength, sizeof(ULONG)); /* Calculate the required block size */ - RegionSize = ROUND_UP(Length, PAGE_SIZE); - - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - (PVOID*)&Param, - 0, - &RegionSize, - MEM_RESERVE | MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) + Param = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); + if (!Param) { RtlReleasePebLock(); - return Status; + return STATUS_INSUFFICIENT_RESOURCES; } DPRINT ("Process parameters allocated\n"); - Param->MaximumLength = RegionSize; + Param->MaximumLength = Length; Param->Length = Length; Param->Flags = RTL_USER_PROCESS_PARAMETERS_NORMALIZED; Param->Environment = Environment; @@ -219,15 +210,12 @@ /* * @implemented */ -NTSTATUS NTAPI -RtlDestroyProcessParameters(PRTL_USER_PROCESS_PARAMETERS ProcessParameters) -{ - SIZE_T RegionSize = 0; - - return ZwFreeVirtualMemory (NtCurrentProcess (), - (PVOID)ProcessParameters, - &RegionSize, - MEM_RELEASE); +NTSTATUS +NTAPI +RtlDestroyProcessParameters(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters) +{ + RtlFreeHeap(RtlGetProcessHeap(), 0, ProcessParameters); + return STATUS_SUCCESS; } /*

1 0

[khornicek] 49168: [MMIXER] Amendment to rev. 49167 requested by Caemyr.
by khornicek＠svn.reactos.org 16 Oct '10

16 Oct '10

Author: khornicek Date: Sat Oct 16 13:55:09 2010 New Revision: 49168 URL: http://svn.reactos.org/svn/reactos?rev=49168&view=rev Log: [MMIXER] Amendment to rev. 49167 requested by Caemyr. Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Sat Oct 16 13:55:09 2010 @@ -835,7 +835,7 @@ /* sanity checks */ ASSERT(PinsCount != 0); - ASSERT(PinsCount == 1); + //ASSERT(PinsCount == 1); /* create destination line */ Status = MMixerBuildMixerDestinationLine(MixerContext, MixerInfo, Pins[0], bInput);

1 0

[janderwald] 49167: [MMIXER] - Disable assert for now
by janderwald＠svn.reactos.org 16 Oct '10

16 Oct '10

Author: janderwald Date: Sat Oct 16 12:39:49 2010 New Revision: 49167 URL: http://svn.reactos.org/svn/reactos?rev=49167&view=rev Log: [MMIXER] - Disable assert for now Modified: trunk/reactos/lib/drivers/sound/mmixer/wave.c Modified: trunk/reactos/lib/drivers/sound/mmixer/wave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/w… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/wave.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/wave.c [iso-8859-1] Sat Oct 16 12:39:49 2010 @@ -357,8 +357,12 @@ if (!WaveInfo) return MM_STATUS_NO_MEMORY; - /* FIXME support multiple pins for wave device */ - ASSERT(PinCount == 1); + if (PinCount > 1) + { + /* FIXME support multiple pins for wave device */ + DPRINT1("Implement support for multiple pins\n"); + //ASSERT(PinCount == 1); + } /* initialize wave info */ WaveInfo->DeviceId = MixerData->DeviceId;

1 0

[janderwald] 49166: [MMIXER] - Add support for topologies where pins directly connect to other pins without nodes in between - Check if the topology contains node. Fixes assert hit in VmWare Player...
by janderwald＠svn.reactos.org 16 Oct '10

16 Oct '10

Author: janderwald Date: Sat Oct 16 12:36:21 2010 New Revision: 49166 URL: http://svn.reactos.org/svn/reactos?rev=49166&view=rev Log: [MMIXER] - Add support for topologies where pins directly connect to other pins without nodes in between - Check if the topology contains node. Fixes assert hit in VmWare Player(sound is not working) - Thanks to Caemyr for testing Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c trunk/reactos/lib/drivers/sound/mmixer/priv.h trunk/reactos/lib/drivers/sound/mmixer/topology.c Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Sat Oct 16 12:36:21 2010 @@ -644,6 +644,7 @@ MMixerGetAllUpOrDownstreamNodesFromNodeIndex(MixerContext, Topology, LineTerminator, TRUE, &AllNodesCount, AllNodes); /* get all pins which indirectly / directly connect to this node */ + AllPinsCount = 0; MMixerGetAllUpOrDownstreamPinsFromNodeIndex(MixerContext, Topology, LineTerminator, TRUE, &AllPinsCount, AllPins); DPRINT("LineTerminator %lu\n", LineTerminator); @@ -818,6 +819,7 @@ /* the mixer is an output mixer * find end pin of the node path */ + PinsCount = 0; Status = MMixerGetAllUpOrDownstreamPinsFromPinIndex(MixerContext, Topology, OutConnection->Pin, FALSE, &PinsCount, Pins); /* check for success */ @@ -925,6 +927,7 @@ * For source pins (wave in) search down stream * The search direction is always the opposite of the current mixer type */ + PinsFound = 0; MMixerGetAllUpOrDownstreamPinsFromNodeIndex(MixerContext, Topology, NodeIndex, !bInputMixer, &PinsFound, Pins); /* if there is now pin found, we have a broken topology */ @@ -961,6 +964,7 @@ Status = MMixerAllocateTopologyPinArray(MixerContext, Topology, &Pins); ASSERT(Status == MM_STATUS_SUCCESS); + PinsFound = 0; MMixerGetAllUpOrDownstreamPinsFromNodeIndex(MixerContext, Topology, NodeIndex, bInputMixer, &PinsFound, Pins); /* if there is no pin found, we have a broken topology */ Modified: trunk/reactos/lib/drivers/sound/mmixer/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/p… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] Sat Oct 16 12:36:21 2010 @@ -47,6 +47,12 @@ ULONG NodesConnectedFromCount; PTOPOLOGY_NODE * NodesConnectedFrom; + + ULONG PinConnectedFromCount; + PULONG PinConnectedFrom; + + ULONG PinConnectedToCount; + PULONG PinConnectedTo; ULONG Visited; }PIN, *PPIN; Modified: trunk/reactos/lib/drivers/sound/mmixer/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/t… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/topology.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/topology.c [iso-8859-1] Sat Oct 16 12:36:21 2010 @@ -70,16 +70,19 @@ } /* allocate topology nodes */ - Topology->TopologyNodes = (PTOPOLOGY_NODE) MixerContext->Alloc(sizeof(TOPOLOGY_NODE) * NodesCount); - - if (!Topology->TopologyNodes) - { - /* release memory */ - MixerContext->Free(Topology->TopologyPins); - MixerContext->Free(Topology); - - /* out of memory */ - return MM_STATUS_NO_MEMORY; + if (NodesCount) + { + Topology->TopologyNodes = (PTOPOLOGY_NODE) MixerContext->Alloc(sizeof(TOPOLOGY_NODE) * NodesCount); + + if (!Topology->TopologyNodes) + { + /* release memory */ + MixerContext->Free(Topology->TopologyPins); + MixerContext->Free(Topology); + + /* out of memory */ + return MM_STATUS_NO_MEMORY; + } } /* initialize topology */ @@ -336,6 +339,79 @@ } MIXER_STATUS +MMixerAddPinToPinConnection( + IN PMIXER_CONTEXT MixerContext, + IN OUT PPIN InPin, + IN OUT PPIN OutPin) +{ + ULONG Count; + PULONG NewPinsIndex; + + /* now enlarge PinConnectedTo */ + Count = InPin->PinConnectedToCount; + + /* allocate pin connection index */ + NewPinsIndex = MixerContext->Alloc(sizeof(ULONG) * (Count + 1)); + + if (!NewPinsIndex) + { + /* out of memory */ + return MM_STATUS_NO_MEMORY; + } + + if (Count) + { + /* copy existing nodes */ + MixerContext->Copy(NewPinsIndex, InPin->PinConnectedTo, sizeof(ULONG) * Count); + + /* release old nodes array */ + MixerContext->Free(InPin->PinConnectedTo); + } + + /* add new topology node */ + NewPinsIndex[Count] = OutPin->PinId; + + /* replace old nodes array */ + InPin->PinConnectedTo = NewPinsIndex; + + /* increment pin count */ + InPin->PinConnectedToCount++; + + /* now enlarge PinConnectedFrom */ + Count = OutPin->PinConnectedFromCount; + + /* allocate pin connection index */ + NewPinsIndex = MixerContext->Alloc(sizeof(ULONG) * (Count + 1)); + + if (!NewPinsIndex) + { + /* out of memory */ + return MM_STATUS_NO_MEMORY; + } + + if (Count) + { + /* copy existing nodes */ + MixerContext->Copy(NewPinsIndex, OutPin->PinConnectedFrom, sizeof(ULONG) * Count); + + /* release old nodes array */ + MixerContext->Free(OutPin->PinConnectedFrom); + } + + /* add new topology node */ + NewPinsIndex[Count] = InPin->PinId; + + /* replace old nodes array */ + OutPin->PinConnectedFrom = NewPinsIndex; + + /* increment pin count */ + OutPin->PinConnectedFromCount++; + + /* done */ + return MM_STATUS_SUCCESS; +} + +MIXER_STATUS MMixerHandleNodePinConnection( IN PMIXER_CONTEXT MixerContext, IN PKSTOPOLOGY_CONNECTION Connection, @@ -345,7 +421,22 @@ PTOPOLOGY_NODE Node; /* check type */ - if (Connection->FromNode == KSFILTER_NODE) + if (Connection->FromNode == KSFILTER_NODE && + Connection->ToNode == KSFILTER_NODE) + { + /* Pin -> Pin direction */ + + /* sanity checks */ + ASSERT(Topology->TopologyPinsCount > Connection->FromNodePin); + ASSERT(Topology->TopologyPinsCount > Connection->ToNodePin); + + /* add connection */ + return MMixerAddPinToPinConnection(MixerContext, + &Topology->TopologyPins[Connection->FromNodePin], + &Topology->TopologyPins[Connection->ToNodePin]); + + } + else if (Connection->FromNode == KSFILTER_NODE) { /* Pin -> Node direction */ @@ -543,6 +634,18 @@ ASSERT(Pin->Visited == FALSE); ASSERT(Pins[Index] == Pin->PinId); + /* FIXME support Pin -> Pin connections in iteration */ + if (bUpStream) + { + /* indicates a very broken topology Pin -> Pin -> Node <-... */ + ASSERT(Pin->PinConnectedFromCount == 0); + } + else + { + /* indicates a very broken topology -> Node -> Pin -> Pin */ + ASSERT(Pin->PinConnectedToCount == 0); + } + /* add them to pin array */ MMixerAddPinIndexToArray(MixerContext, Pin->PinId, Topology->TopologyPinsCount, OutPinCount, OutPins); @@ -592,9 +695,6 @@ { PTOPOLOGY_NODE TopologyNode; - /* mark them as empty */ - *OutPinsCount = 0; - /* reset visited status */ MMixerResetTopologyVisitStatus(Topology); @@ -694,27 +794,34 @@ OUT PULONG OutPinsCount, OUT PULONG OutPins) { - ULONG Index, TopologyNodesCount; + ULONG Index, TopologyNodesCount, TopologyPinsCount; PPIN Pin; PTOPOLOGY_NODE *TopologyNodes; - - /* mark them as empty */ - *OutPinsCount = 0; + PULONG TopologyPins; /* get pin */ Pin = &Topology->TopologyPins[PinIndex]; if (bUpStream) { - /* use nodes to which a pin is attached to */ + /* use nodes to which this pin is attached to */ TopologyNodes = Pin->NodesConnectedFrom; TopologyNodesCount = Pin->NodesConnectedFromCount; + + /* use pins to which this pin is attached to */ + TopologyPins = Pin->PinConnectedFrom; + TopologyPinsCount = Pin->PinConnectedFromCount; + } else { - /* use nodes which are attached to a node */ + /* use nodes which are attached to a pin */ TopologyNodes = Pin->NodesConnectedTo; TopologyNodesCount = Pin->NodesConnectedToCount; + + /* use pins which are attached to this pin */ + TopologyPins = Pin->PinConnectedTo; + TopologyPinsCount = Pin->PinConnectedToCount; } @@ -723,6 +830,13 @@ /* sanity check */ ASSERT(Topology->TopologyPinsCount > PinIndex); + + /* add pins which are directly connected to this pin */ + for(Index = 0; Index < TopologyPinsCount; Index++) + { + /* add them to pin array */ + MMixerAddPinIndexToArray(MixerContext, TopologyPins[Index], Topology->TopologyPinsCount, OutPinsCount, OutPins); + } /* now visit all up / down stream pins & nodes */ for(Index = 0; Index < TopologyNodesCount; Index++) @@ -991,6 +1105,7 @@ } /* now get connected pins */ + PinsCount = 0; MMixerGetAllUpOrDownstreamPinsFromNodeIndex(MixerContext, Topology, NodeIndex, bUpStream, &PinsCount, Pins); /* set to false */ @@ -1082,7 +1197,7 @@ return Status; } - //MMixerPrintTopology(Topology); + MMixerPrintTopology(Topology); /* store result */ *OutTopology = Topology;

1 0

[ekohl] 49165: [LSASRV] - Change the calling convention of all LSA-RPC function to stdcall. - Export some of the LSA-RPC functions.
by ekohl＠svn.reactos.org 16 Oct '10

16 Oct '10

Author: ekohl Date: Sat Oct 16 12:34:04 2010 New Revision: 49165 URL: http://svn.reactos.org/svn/reactos?rev=49165&view=rev Log: [LSASRV] - Change the calling convention of all LSA-RPC function to stdcall. - Export some of the LSA-RPC functions. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.spec trunk/reactos/include/reactos/idl/lsa.idl 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 Oct 16 12:34:04 2010 @@ -144,7 +144,7 @@ /* Function 0 */ -NTSTATUS LsarClose( +NTSTATUS WINAPI LsarClose( LSAPR_HANDLE *ObjectHandle) { NTSTATUS Status = STATUS_SUCCESS; @@ -170,7 +170,7 @@ /* Function 1 */ -NTSTATUS LsarDelete( +NTSTATUS WINAPI LsarDelete( LSAPR_HANDLE ObjectHandle) { /* Deprecated */ @@ -179,7 +179,7 @@ /* Function 2 */ -NTSTATUS LsarEnumeratePrivileges( +NTSTATUS WINAPI LsarEnumeratePrivileges( LSAPR_HANDLE PolicyHandle, DWORD *EnumerationContext, PLSAPR_PRIVILEGE_ENUM_BUFFER EnumerationBuffer, @@ -191,7 +191,7 @@ /* Function 3 */ -NTSTATUS LsarQuerySecurityObject( +NTSTATUS WINAPI LsarQuerySecurityObject( LSAPR_HANDLE ObjectHandle, SECURITY_INFORMATION SecurityInformation, PLSAPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor) @@ -202,7 +202,7 @@ /* Function 4 */ -NTSTATUS LsarSetSecurityObject( +NTSTATUS WINAPI LsarSetSecurityObject( LSAPR_HANDLE ObjectHandle, SECURITY_INFORMATION SecurityInformation, PLSAPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor) @@ -213,7 +213,7 @@ /* Function 5 */ -NTSTATUS LsarChangePassword( +NTSTATUS WINAPI LsarChangePassword( handle_t IDL_handle, PRPC_UNICODE_STRING String1, PRPC_UNICODE_STRING String2, @@ -227,7 +227,7 @@ /* Function 6 */ -NTSTATUS LsarOpenPolicy( +NTSTATUS WINAPI LsarOpenPolicy( LPWSTR SystemName, PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, ACCESS_MASK DesiredAccess, @@ -253,7 +253,7 @@ /* Function 7 */ -NTSTATUS LsarQueryInformationPolicy( +NTSTATUS WINAPI LsarQueryInformationPolicy( LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, PLSAPR_POLICY_INFORMATION *PolicyInformation) @@ -404,7 +404,7 @@ /* Function 8 */ -NTSTATUS LsarSetInformationPolicy( +NTSTATUS WINAPI LsarSetInformationPolicy( LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, PLSAPR_POLICY_INFORMATION PolicyInformation) @@ -415,7 +415,7 @@ /* Function 9 */ -NTSTATUS LsarClearAuditLog( +NTSTATUS WINAPI LsarClearAuditLog( LSAPR_HANDLE ObjectHandle) { /* Deprecated */ @@ -424,7 +424,7 @@ /* Function 10 */ -NTSTATUS LsarCreateAccount( +NTSTATUS WINAPI LsarCreateAccount( LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, ACCESS_MASK DesiredAccess, @@ -436,7 +436,7 @@ /* Function 11 */ -NTSTATUS LsarEnumerateAccounts( +NTSTATUS WINAPI LsarEnumerateAccounts( LSAPR_HANDLE PolicyHandle, DWORD *EnumerationContext, PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer, @@ -448,7 +448,7 @@ /* Function 12 */ -NTSTATUS LsarCreateTrustedDomain( +NTSTATUS WINAPI LsarCreateTrustedDomain( LSAPR_HANDLE PolicyHandle, PLSAPR_TRUST_INFORMATION TrustedDomainInformation, ACCESS_MASK DesiredAccess, @@ -460,7 +460,7 @@ /* Function 13 */ -NTSTATUS LsarEnumerateTrustedDomains( +NTSTATUS WINAPI LsarEnumerateTrustedDomains( LSAPR_HANDLE PolicyHandle, DWORD *EnumerationContext, PLSAPR_TRUSTED_ENUM_BUFFER EnumerationBuffer, @@ -472,7 +472,7 @@ /* Function 14 */ -NTSTATUS LsarLookupNames( +NTSTATUS WINAPI LsarLookupNames( LSAPR_HANDLE PolicyHandle, DWORD Count, PRPC_UNICODE_STRING Names, @@ -570,7 +570,7 @@ /* Function 15 */ -NTSTATUS LsarLookupSids( +NTSTATUS WINAPI LsarLookupSids( LSAPR_HANDLE PolicyHandle, PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -663,7 +663,7 @@ /* Function 16 */ -NTSTATUS LsarCreateSecret( +NTSTATUS WINAPI LsarCreateSecret( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING SecretName, ACCESS_MASK DesiredAccess, @@ -675,7 +675,7 @@ /* Function 17 */ -NTSTATUS LsarOpenAccount( +NTSTATUS WINAPI LsarOpenAccount( LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, ACCESS_MASK DesiredAccess, @@ -687,7 +687,7 @@ /* Function 18 */ -NTSTATUS LsarEnumeratePrivilegesAccount( +NTSTATUS WINAPI LsarEnumeratePrivilegesAccount( LSAPR_HANDLE AccountHandle, PLSAPR_PRIVILEGE_SET *Privileges) { @@ -697,7 +697,7 @@ /* Function 19 */ -NTSTATUS LsarAddPrivilegesToAccount( +NTSTATUS WINAPI LsarAddPrivilegesToAccount( LSAPR_HANDLE AccountHandle, PLSAPR_PRIVILEGE_SET Privileges) { @@ -707,7 +707,7 @@ /* Function 20 */ -NTSTATUS LsarRemovePrivilegesFromAccount( +NTSTATUS WINAPI LsarRemovePrivilegesFromAccount( LSAPR_HANDLE AccountHandle, BOOL AllPrivileges, PLSAPR_PRIVILEGE_SET Privileges) @@ -718,7 +718,7 @@ /* Function 21 */ -NTSTATUS LsarGetQuotasForAccount( +NTSTATUS WINAPI LsarGetQuotasForAccount( LSAPR_HANDLE AccountHandle, PQUOTA_LIMITS QuotaLimits) { @@ -728,7 +728,7 @@ /* Function 22 */ -NTSTATUS LsarSetQuotasForAccount( +NTSTATUS WINAPI LsarSetQuotasForAccount( LSAPR_HANDLE AccountHandle, PQUOTA_LIMITS QuotaLimits) { @@ -738,7 +738,7 @@ /* Function 23 */ -NTSTATUS LsarGetSystemAccessAccount( +NTSTATUS WINAPI LsarGetSystemAccessAccount( LSAPR_HANDLE AccountHandle, ACCESS_MASK *SystemAccess) { @@ -748,7 +748,7 @@ /* Function 24 */ -NTSTATUS LsarSetSystemAccessAccount( +NTSTATUS WINAPI LsarSetSystemAccessAccount( LSAPR_HANDLE AccountHandle, ACCESS_MASK SystemAccess) { @@ -758,7 +758,7 @@ /* Function 25 */ -NTSTATUS LsarOpenTrustedDomain( +NTSTATUS WINAPI LsarOpenTrustedDomain( LSAPR_HANDLE PolicyHandle, PRPC_SID TrustedDomainSid, ACCESS_MASK DesiredAccess, @@ -770,7 +770,7 @@ /* Function 26 */ -NTSTATUS LsarQueryInfoTrustedDomain( +NTSTATUS WINAPI LsarQueryInfoTrustedDomain( LSAPR_HANDLE TrustedDomainHandle, TRUSTED_INFORMATION_CLASS InformationClass, PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation) @@ -781,7 +781,7 @@ /* Function 27 */ -NTSTATUS LsarSetInformationTrustedDomain( +NTSTATUS WINAPI LsarSetInformationTrustedDomain( LSAPR_HANDLE TrustedDomainHandle, TRUSTED_INFORMATION_CLASS InformationClass, PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation) @@ -792,7 +792,7 @@ /* Function 28 */ -NTSTATUS LsarOpenSecret( +NTSTATUS WINAPI LsarOpenSecret( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING SecretName, ACCESS_MASK DesiredAccess, @@ -804,7 +804,7 @@ /* Function 29 */ -NTSTATUS LsarSetSecret( +NTSTATUS WINAPI LsarSetSecret( LSAPR_HANDLE *SecretHandle, PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue, PLSAPR_CR_CIPHER_VALUE EncryptedOldValue) @@ -815,7 +815,7 @@ /* Function 30 */ -NTSTATUS LsarQuerySecret( +NTSTATUS WINAPI LsarQuerySecret( LSAPR_HANDLE SecretHandle, PLSAPR_CR_CIPHER_VALUE *EncryptedCurrentValue, PLARGE_INTEGER CurrentValueSetTime, @@ -828,7 +828,7 @@ /* Function 31 */ -NTSTATUS LsarLookupPrivilegeValue( +NTSTATUS WINAPI LsarLookupPrivilegeValue( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING Name, PLUID Value) @@ -857,7 +857,7 @@ /* Function 32 */ -NTSTATUS LsarLookupPrivilegeName( +NTSTATUS WINAPI LsarLookupPrivilegeName( LSAPR_HANDLE PolicyHandle, PLUID Value, PRPC_UNICODE_STRING *Name) @@ -883,7 +883,7 @@ /* Function 33 */ -NTSTATUS LsarLookupPrivilegeDisplayName( +NTSTATUS WINAPI LsarLookupPrivilegeDisplayName( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING Name, USHORT ClientLanguage, @@ -897,7 +897,7 @@ /* Function 34 */ -NTSTATUS LsarDeleteObject( +NTSTATUS WINAPI LsarDeleteObject( LSAPR_HANDLE *ObjectHandle) { UNIMPLEMENTED; @@ -906,7 +906,7 @@ /* Function 35 */ -NTSTATUS LsarEnumerateAccountsWithUserRight( +NTSTATUS WINAPI LsarEnumerateAccountsWithUserRight( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING UserRight, PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer) @@ -917,7 +917,7 @@ /* Function 36 */ -NTSTATUS LsarEnmuerateAccountRights( +NTSTATUS WINAPI LsarEnmuerateAccountRights( LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, PLSAPR_USER_RIGHT_SET UserRights) @@ -939,7 +939,7 @@ /* Function 37 */ -NTSTATUS LsarAddAccountRights( +NTSTATUS WINAPI LsarAddAccountRights( LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, PLSAPR_USER_RIGHT_SET UserRights) @@ -950,7 +950,7 @@ /* Function 38 */ -NTSTATUS LsarRemoveAccountRights( +NTSTATUS WINAPI LsarRemoveAccountRights( LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, BOOL AllRights, @@ -962,7 +962,7 @@ /* Function 39 */ -NTSTATUS LsarQueryTrustedDomainInfo( +NTSTATUS WINAPI LsarQueryTrustedDomainInfo( LSAPR_HANDLE PolicyHandle, PRPC_SID TrustedDomainSid, TRUSTED_INFORMATION_CLASS InformationClass, @@ -974,7 +974,7 @@ /* Function 40 */ -NTSTATUS LsarSetTrustedDomainInfo( +NTSTATUS WINAPI LsarSetTrustedDomainInfo( LSAPR_HANDLE PolicyHandle, PRPC_SID TrustedDomainSid, TRUSTED_INFORMATION_CLASS InformationClass, @@ -986,7 +986,7 @@ /* Function 41 */ -NTSTATUS LsarDeleteTrustedDomain( +NTSTATUS WINAPI LsarDeleteTrustedDomain( LSAPR_HANDLE PolicyHandle, PRPC_SID TrustedDomainSid) { @@ -996,7 +996,7 @@ /* Function 42 */ -NTSTATUS LsarStorePrivateData( +NTSTATUS WINAPI LsarStorePrivateData( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING KeyName, PLSAPR_CR_CIPHER_VALUE EncryptedData) @@ -1007,7 +1007,7 @@ /* Function 43 */ -NTSTATUS LsarRetrievePrivateData( +NTSTATUS WINAPI LsarRetrievePrivateData( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING KeyName, PLSAPR_CR_CIPHER_VALUE *EncryptedData) @@ -1018,7 +1018,7 @@ /* Function 44 */ -NTSTATUS LsarOpenPolicy2( +NTSTATUS WINAPI LsarOpenPolicy2( LPWSTR SystemName, PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, ACCESS_MASK DesiredAccess, @@ -1030,7 +1030,7 @@ /* Function 45 */ -NTSTATUS LsarGetUserName( +NTSTATUS WINAPI LsarGetUserName( LPWSTR SystemName, PRPC_UNICODE_STRING *UserName, PRPC_UNICODE_STRING *DomainName) @@ -1041,7 +1041,7 @@ /* Function 46 */ -NTSTATUS LsarQueryInformationPolicy2( +NTSTATUS WINAPI LsarQueryInformationPolicy2( LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, unsigned long *PolicyInformation) @@ -1052,7 +1052,7 @@ /* Function 47 */ -NTSTATUS LsarSetInformationPolicy2( +NTSTATUS WINAPI LsarSetInformationPolicy2( LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, unsigned long PolicyInformation) @@ -1063,7 +1063,7 @@ /* Function 48 */ -NTSTATUS LsarQueryTrustedDomainInfoByName( +NTSTATUS WINAPI LsarQueryTrustedDomainInfoByName( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING TrustedDomainName, POLICY_INFORMATION_CLASS InformationClass, @@ -1075,7 +1075,7 @@ /* Function 49 */ -NTSTATUS LsarSetTrustedDomainInfoByName( +NTSTATUS WINAPI LsarSetTrustedDomainInfoByName( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING TrustedDomainName, POLICY_INFORMATION_CLASS InformationClass, @@ -1087,7 +1087,7 @@ /* Function 50 */ -NTSTATUS LsarEnumerateTrustedDomainsEx( +NTSTATUS WINAPI LsarEnumerateTrustedDomainsEx( LSAPR_HANDLE PolicyHandle, DWORD *EnumerationContext, PLSAPR_TRUSTED_ENUM_BUFFER_EX EnumerationBuffer, @@ -1099,7 +1099,7 @@ /* Function 51 */ -NTSTATUS LsarCreateTrustedDomainEx( +NTSTATUS WINAPI LsarCreateTrustedDomainEx( LSAPR_HANDLE PolicyHandle, PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION AuthentificationInformation, @@ -1112,7 +1112,7 @@ /* Function 52 */ -NTSTATUS LsarSetPolicyReplicationHandle( +NTSTATUS WINAPI LsarSetPolicyReplicationHandle( PLSAPR_HANDLE PolicyHandle) { /* Deprecated */ @@ -1121,7 +1121,7 @@ /* Function 53 */ -NTSTATUS LsarQueryDomainInformationPolicy( +NTSTATUS WINAPI LsarQueryDomainInformationPolicy( LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, unsigned long *PolicyInformation) @@ -1132,7 +1132,7 @@ /* Function 54 */ -NTSTATUS LsarSetDomainInformationPolicy( +NTSTATUS WINAPI LsarSetDomainInformationPolicy( LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, unsigned long PolicyInformation) @@ -1143,7 +1143,7 @@ /* Function 55 */ -NTSTATUS LsarOpenTrustedDomainByName( +NTSTATUS WINAPI LsarOpenTrustedDomainByName( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING TrustedDomainName, ACCESS_MASK DesiredAccess, @@ -1155,7 +1155,7 @@ /* Function 56 */ -NTSTATUS LsarTestCall( +NTSTATUS WINAPI LsarTestCall( handle_t hBinding) { UNIMPLEMENTED; @@ -1164,7 +1164,7 @@ /* Function 57 */ -NTSTATUS LsarLookupSids2( +NTSTATUS WINAPI LsarLookupSids2( LSAPR_HANDLE PolicyHandle, PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -1180,7 +1180,7 @@ /* Function 58 */ -NTSTATUS LsarLookupNames2( +NTSTATUS WINAPI LsarLookupNames2( LSAPR_HANDLE PolicyHandle, DWORD Count, PRPC_UNICODE_STRING Names, @@ -1197,7 +1197,7 @@ /* Function 59 */ -NTSTATUS LsarCreateTrustedDomainEx2( +NTSTATUS WINAPI LsarCreateTrustedDomainEx2( LSAPR_HANDLE PolicyHandle, PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION_INTERNAL AuthentificationInformation, @@ -1210,7 +1210,7 @@ /* Function 60 */ -NTSTATUS CredrWrite( +NTSTATUS WINAPI CredrWrite( handle_t hBinding) { UNIMPLEMENTED; @@ -1219,7 +1219,7 @@ /* Function 61 */ -NTSTATUS CredrRead( +NTSTATUS WINAPI CredrRead( handle_t hBinding) { UNIMPLEMENTED; @@ -1228,7 +1228,7 @@ /* Function 62 */ -NTSTATUS CredrEnumerate( +NTSTATUS WINAPI CredrEnumerate( handle_t hBinding) { UNIMPLEMENTED; @@ -1237,7 +1237,7 @@ /* Function 63 */ -NTSTATUS CredrWriteDomainCredentials( +NTSTATUS WINAPI CredrWriteDomainCredentials( handle_t hBinding) { UNIMPLEMENTED; @@ -1246,7 +1246,7 @@ /* Function 64 */ -NTSTATUS CredrReadDomainCredentials( +NTSTATUS WINAPI CredrReadDomainCredentials( handle_t hBinding) { UNIMPLEMENTED; @@ -1255,7 +1255,7 @@ /* Function 65 */ -NTSTATUS CredrDelete( +NTSTATUS WINAPI CredrDelete( handle_t hBinding) { UNIMPLEMENTED; @@ -1264,7 +1264,7 @@ /* Function 66 */ -NTSTATUS CredrGetTargetInfo( +NTSTATUS WINAPI CredrGetTargetInfo( handle_t hBinding) { UNIMPLEMENTED; @@ -1273,7 +1273,7 @@ /* Function 67 */ -NTSTATUS CredrProfileLoaded( +NTSTATUS WINAPI CredrProfileLoaded( handle_t hBinding) { UNIMPLEMENTED; @@ -1282,7 +1282,7 @@ /* Function 68 */ -NTSTATUS LsarLookupNames3( +NTSTATUS WINAPI LsarLookupNames3( LSAPR_HANDLE PolicyHandle, DWORD Count, PRPC_UNICODE_STRING Names, @@ -1299,7 +1299,7 @@ /* Function 69 */ -NTSTATUS CredrGetSessionTypes( +NTSTATUS WINAPI CredrGetSessionTypes( handle_t hBinding) { UNIMPLEMENTED; @@ -1308,7 +1308,7 @@ /* Function 70 */ -NTSTATUS LsarRegisterAuditEvent( +NTSTATUS WINAPI LsarRegisterAuditEvent( handle_t hBinding) { UNIMPLEMENTED; @@ -1317,7 +1317,7 @@ /* Function 71 */ -NTSTATUS LsarGenAuditEvent( +NTSTATUS WINAPI LsarGenAuditEvent( handle_t hBinding) { UNIMPLEMENTED; @@ -1326,7 +1326,7 @@ /* Function 72 */ -NTSTATUS LsarUnregisterAuditEvent( +NTSTATUS WINAPI LsarUnregisterAuditEvent( handle_t hBinding) { UNIMPLEMENTED; @@ -1335,7 +1335,7 @@ /* Function 73 */ -NTSTATUS LsarQueryForestTrustInformation( +NTSTATUS WINAPI LsarQueryForestTrustInformation( LSAPR_HANDLE PolicyHandle, PLSA_UNICODE_STRING TrustedDomainName, LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, @@ -1347,7 +1347,7 @@ /* Function 74 */ -NTSTATUS LsarSetForestTrustInformation( +NTSTATUS WINAPI LsarSetForestTrustInformation( LSAPR_HANDLE PolicyHandle, PLSA_UNICODE_STRING TrustedDomainName, LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, @@ -1361,7 +1361,7 @@ /* Function 75 */ -NTSTATUS CredrRename( +NTSTATUS WINAPI CredrRename( handle_t hBinding) { UNIMPLEMENTED; @@ -1370,7 +1370,7 @@ /* Function 76 */ -NTSTATUS LsarLookupSids3( +NTSTATUS WINAPI LsarLookupSids3( LSAPR_HANDLE PolicyHandle, PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -1386,7 +1386,7 @@ /* Function 77 */ -NTSTATUS LsarLookupNames4( +NTSTATUS WINAPI LsarLookupNames4( handle_t RpcHandle, DWORD Count, PRPC_UNICODE_STRING Names, @@ -1403,7 +1403,7 @@ /* Function 78 */ -NTSTATUS LsarOpenPolicySce( +NTSTATUS WINAPI LsarOpenPolicySce( handle_t hBinding) { UNIMPLEMENTED; @@ -1412,7 +1412,7 @@ /* Function 79 */ -NTSTATUS LsarAdtRegisterSecurityEventSource( +NTSTATUS WINAPI LsarAdtRegisterSecurityEventSource( handle_t hBinding) { UNIMPLEMENTED; @@ -1421,7 +1421,7 @@ /* Function 80 */ -NTSTATUS LsarAdtUnregisterSecurityEventSource( +NTSTATUS WINAPI LsarAdtUnregisterSecurityEventSource( handle_t hBinding) { UNIMPLEMENTED; @@ -1430,7 +1430,7 @@ /* Function 81 */ -NTSTATUS LsarAdtReportSecurityEvent( +NTSTATUS WINAPI LsarAdtReportSecurityEvent( handle_t hBinding) { UNIMPLEMENTED; @@ -1439,7 +1439,7 @@ /* Function 82 */ -NTSTATUS CredrFindBestCredential( +NTSTATUS WINAPI CredrFindBestCredential( handle_t hBinding) { UNIMPLEMENTED; @@ -1448,7 +1448,7 @@ /* Function 83 */ -NTSTATUS LsarSetAuditPolicy( +NTSTATUS WINAPI LsarSetAuditPolicy( handle_t hBinding) { UNIMPLEMENTED; @@ -1457,7 +1457,7 @@ /* Function 84 */ -NTSTATUS LsarQueryAuditPolicy( +NTSTATUS WINAPI LsarQueryAuditPolicy( handle_t hBinding) { UNIMPLEMENTED; @@ -1466,7 +1466,7 @@ /* Function 85 */ -NTSTATUS LsarEnumerateAuditPolicy( +NTSTATUS WINAPI LsarEnumerateAuditPolicy( handle_t hBinding) { UNIMPLEMENTED; @@ -1475,7 +1475,7 @@ /* Function 86 */ -NTSTATUS LsarEnumerateAuditCategories( +NTSTATUS WINAPI LsarEnumerateAuditCategories( handle_t hBinding) { UNIMPLEMENTED; @@ -1484,7 +1484,7 @@ /* Function 87 */ -NTSTATUS LsarEnumerateAuditSubCategories( +NTSTATUS WINAPI LsarEnumerateAuditSubCategories( handle_t hBinding) { UNIMPLEMENTED; @@ -1493,7 +1493,7 @@ /* Function 88 */ -NTSTATUS LsarLookupAuditCategoryName( +NTSTATUS WINAPI LsarLookupAuditCategoryName( handle_t hBinding) { UNIMPLEMENTED; @@ -1502,7 +1502,7 @@ /* Function 89 */ -NTSTATUS LsarLookupAuditSubCategoryName( +NTSTATUS WINAPI LsarLookupAuditSubCategoryName( handle_t hBinding) { UNIMPLEMENTED; @@ -1511,7 +1511,7 @@ /* Function 90 */ -NTSTATUS LsarSetAuditSecurity( +NTSTATUS WINAPI LsarSetAuditSecurity( handle_t hBinding) { UNIMPLEMENTED; @@ -1520,7 +1520,7 @@ /* Function 91 */ -NTSTATUS LsarQueryAuditSecurity( +NTSTATUS WINAPI LsarQueryAuditSecurity( handle_t hBinding) { UNIMPLEMENTED; @@ -1529,7 +1529,7 @@ /* Function 92 */ -NTSTATUS CredReadByTokenHandle( +NTSTATUS WINAPI CredReadByTokenHandle( handle_t hBinding) { UNIMPLEMENTED; @@ -1538,7 +1538,7 @@ /* Function 93 */ -NTSTATUS CredrRestoreCredentials( +NTSTATUS WINAPI CredrRestoreCredentials( handle_t hBinding) { UNIMPLEMENTED; @@ -1547,7 +1547,7 @@ /* Function 94 */ -NTSTATUS CredrBackupCredentials( +NTSTATUS WINAPI CredrBackupCredentials( handle_t hBinding) { UNIMPLEMENTED; Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.sp… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] Sat Oct 16 12:34:04 2010 @@ -30,36 +30,36 @@ @ stub LsaISetupWasRun @ stub LsapAuOpenSam @ stdcall LsapInitLsa() - @ stub LsarAddPrivilegesToAccount - @ stub LsarClose - @ stub LsarCreateAccount - @ stub LsarCreateSecret - @ stub LsarCreateTrustedDomain - @ stub LsarDelete - @ stub LsarEnumerateAccounts - @ stub LsarEnumeratePrivileges - @ stub LsarEnumeratePrivilegesAccount - @ stub LsarEnumerateTrustedDomains - @ stub LsarGetQuotasForAccount - @ stub LsarGetSystemAccessAccount - @ stub LsarLookupNames - @ stub LsarLookupPrivilegeDisplayName - @ stub LsarLookupPrivilegeName - @ stub LsarLookupPrivilegeValue - @ stub LsarLookupSids - @ stub LsarOpenAccount - @ stub LsarOpenPolicy - @ stub LsarOpenSecret - @ stub LsarOpenTrustedDomain - @ stub LsarQueryInfoTrustedDomain - @ stub LsarQueryInformationPolicy - @ stub LsarQuerySecret - @ stub LsarQuerySecurityObject - @ stub LsarRemovePrivilegesFromAccount - @ stub LsarSetInformationPolicy - @ stub LsarSetInformationTrustedDomain - @ stub LsarSetQuotasForAccount - @ stub LsarSetSecret - @ stub LsarSetSecurityObject - @ stub LsarSetSystemAccessAccount + @ stdcall LsarAddPrivilegesToAccount(ptr ptr) + @ stdcall LsarClose(ptr) + @ stdcall LsarCreateAccount(ptr ptr long ptr) + @ stdcall LsarCreateSecret(ptr ptr long ptr) + @ stdcall LsarCreateTrustedDomain(ptr ptr long ptr) + @ stdcall LsarDelete(ptr) + @ stdcall LsarEnumerateAccounts(ptr ptr ptr long) + @ stdcall LsarEnumeratePrivileges(ptr ptr ptr long) + @ stdcall LsarEnumeratePrivilegesAccount(ptr ptr) + @ stdcall LsarEnumerateTrustedDomains(ptr ptr ptr long) + @ stdcall LsarGetQuotasForAccount(ptr ptr) + @ stdcall LsarGetSystemAccessAccount(ptr ptr) + @ stdcall LsarLookupNames(ptr long ptr ptr ptr long ptr) + @ stdcall LsarLookupPrivilegeDisplayName(ptr ptr long long ptr ptr) + @ stdcall LsarLookupPrivilegeName(ptr ptr ptr) + @ stdcall LsarLookupPrivilegeValue(ptr ptr ptr) + @ stdcall LsarLookupSids(ptr ptr ptr ptr long ptr) + @ stdcall LsarOpenAccount(ptr ptr long ptr) + @ stdcall LsarOpenPolicy(ptr ptr long ptr) + @ stdcall LsarOpenSecret(ptr ptr long ptr) + @ stdcall LsarOpenTrustedDomain(ptr ptr long ptr) + @ stdcall LsarQueryInfoTrustedDomain(ptr long ptr) + @ stdcall LsarQueryInformationPolicy(ptr long ptr) + @ stdcall LsarQuerySecret(ptr ptr ptr ptr ptr) + @ stdcall LsarQuerySecurityObject(ptr long ptr) + @ stdcall LsarRemovePrivilegesFromAccount(ptr long ptr) + @ stdcall LsarSetInformationPolicy(ptr long ptr) + @ stdcall LsarSetInformationTrustedDomain(ptr long ptr) + @ stdcall LsarSetQuotasForAccount(ptr ptr) + @ stdcall LsarSetSecret(ptr ptr ptr) + @ stdcall LsarSetSecurityObject(ptr long ptr) + @ stdcall LsarSetSystemAccessAccount(ptr long) @ stdcall ServiceInit() Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Sat Oct 16 12:34:04 2010 @@ -592,34 +592,34 @@ interface lsarpc { /* Function 0 */ - NTSTATUS LsarClose( + NTSTATUS __stdcall LsarClose( [in, out] LSAPR_HANDLE *ObjectHandle); /* Function 1 */ - NTSTATUS LsarDelete( + NTSTATUS __stdcall LsarDelete( [in] LSAPR_HANDLE ObjectHandle); /* Function 2 */ - NTSTATUS LsarEnumeratePrivileges( + NTSTATUS __stdcall LsarEnumeratePrivileges( [in] LSAPR_HANDLE PolicyHandle, [in, out] DWORD *EnumerationContext, [out] PLSAPR_PRIVILEGE_ENUM_BUFFER EnumerationBuffer, [in] DWORD PreferedMaximumLength); /* Function 3 */ - NTSTATUS LsarQuerySecurityObject( + NTSTATUS __stdcall LsarQuerySecurityObject( [in] LSAPR_HANDLE ObjectHandle, [in] SECURITY_INFORMATION SecurityInformation, [out] PLSAPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor); /* Function 4 */ - NTSTATUS LsarSetSecurityObject( + NTSTATUS __stdcall LsarSetSecurityObject( [in] LSAPR_HANDLE ObjectHandle, [in] SECURITY_INFORMATION SecurityInformation, [in] PLSAPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor); /* Function 5 */ - NTSTATUS LsarChangePassword( + NTSTATUS __stdcall LsarChangePassword( [in] PRPC_UNICODE_STRING String1, [in] PRPC_UNICODE_STRING String2, [in] PRPC_UNICODE_STRING String3, @@ -627,58 +627,58 @@ [in] PRPC_UNICODE_STRING String5); /* Function 6 */ - NTSTATUS LsarOpenPolicy( + NTSTATUS __stdcall LsarOpenPolicy( [in, unique] PLSAPR_SERVER_NAME SystemName, [in] PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *PolicyHandle); /* Function 7 */ - NTSTATUS LsarQueryInformationPolicy( + NTSTATUS __stdcall LsarQueryInformationPolicy( [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [out, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION *PolicyInformation); /* Function 8 */ - NTSTATUS LsarSetInformationPolicy( + NTSTATUS __stdcall LsarSetInformationPolicy( [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [in, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION PolicyInformation); /* Function 9 */ - NTSTATUS LsarClearAuditLog( + NTSTATUS __stdcall LsarClearAuditLog( [in] LSAPR_HANDLE ObjectHandle); /* Function 10 */ - NTSTATUS LsarCreateAccount( + NTSTATUS __stdcall LsarCreateAccount( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *AccountHandle); /* Function 11 */ - NTSTATUS LsarEnumerateAccounts( + NTSTATUS __stdcall LsarEnumerateAccounts( [in] LSAPR_HANDLE PolicyHandle, [in, out] DWORD *EnumerationContext, [out] PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer, [in] DWORD PreferedMaximumLength); /* Function 12 */ - NTSTATUS LsarCreateTrustedDomain( + NTSTATUS __stdcall LsarCreateTrustedDomain( [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_TRUST_INFORMATION TrustedDomainInformation, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *TrustedDomainHandle); /* Function 13 */ - NTSTATUS LsarEnumerateTrustedDomains( + NTSTATUS __stdcall LsarEnumerateTrustedDomains( [in] LSAPR_HANDLE PolicyHandle, [in, out] DWORD *EnumerationContext, [out] PLSAPR_TRUSTED_ENUM_BUFFER EnumerationBuffer, [in] DWORD PreferedMaximumLength); /* Function 14 */ - NTSTATUS LsarLookupNames( + NTSTATUS __stdcall LsarLookupNames( [in] LSAPR_HANDLE PolicyHandle, [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, @@ -688,7 +688,7 @@ [in, out] DWORD *MappedCount); /* Function 15 */ - NTSTATUS LsarLookupSids( + NTSTATUS __stdcall LsarLookupSids( [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -697,89 +697,89 @@ [in, out] DWORD *MappedCount); /* Function 16 */ - NTSTATUS LsarCreateSecret( + NTSTATUS __stdcall LsarCreateSecret( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING SecretName, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *SecretHandle); /* Function 17 */ - NTSTATUS LsarOpenAccount( + NTSTATUS __stdcall LsarOpenAccount( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *AccountHandle); /* Function 18 */ - NTSTATUS LsarEnumeratePrivilegesAccount( + NTSTATUS __stdcall LsarEnumeratePrivilegesAccount( [in] LSAPR_HANDLE AccountHandle, [out] PLSAPR_PRIVILEGE_SET *Privileges); /* Function 19 */ - NTSTATUS LsarAddPrivilegesToAccount( + NTSTATUS __stdcall LsarAddPrivilegesToAccount( [in] LSAPR_HANDLE AccountHandle, [in] PLSAPR_PRIVILEGE_SET Privileges); /* Function 20 */ - NTSTATUS LsarRemovePrivilegesFromAccount( + NTSTATUS __stdcall LsarRemovePrivilegesFromAccount( [in] LSAPR_HANDLE AccountHandle, [in] BOOL AllPrivileges, [in, unique] PLSAPR_PRIVILEGE_SET Privileges); /* Function 21 */ - NTSTATUS LsarGetQuotasForAccount( + NTSTATUS __stdcall LsarGetQuotasForAccount( [in] LSAPR_HANDLE AccountHandle, [out] PQUOTA_LIMITS QuotaLimits); /* Function 22 */ - NTSTATUS LsarSetQuotasForAccount( + NTSTATUS __stdcall LsarSetQuotasForAccount( [in] LSAPR_HANDLE AccountHandle, [in] PQUOTA_LIMITS QuotaLimits); /* Function 23 */ - NTSTATUS LsarGetSystemAccessAccount( + NTSTATUS __stdcall LsarGetSystemAccessAccount( [in] LSAPR_HANDLE AccountHandle, [out] ACCESS_MASK *SystemAccess); /* Function 24 */ - NTSTATUS LsarSetSystemAccessAccount( + NTSTATUS __stdcall LsarSetSystemAccessAccount( [in] LSAPR_HANDLE AccountHandle, [in] ACCESS_MASK SystemAccess); /* Function 25 */ - NTSTATUS LsarOpenTrustedDomain( + NTSTATUS __stdcall LsarOpenTrustedDomain( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID TrustedDomainSid, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *TrustedDomainHandle); /* Function 26 */ - NTSTATUS LsarQueryInfoTrustedDomain( + NTSTATUS __stdcall LsarQueryInfoTrustedDomain( [in] LSAPR_HANDLE TrustedDomainHandle, [in] TRUSTED_INFORMATION_CLASS InformationClass, [out, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation); /* Function 27 */ - NTSTATUS LsarSetInformationTrustedDomain( + NTSTATUS __stdcall LsarSetInformationTrustedDomain( [in] LSAPR_HANDLE TrustedDomainHandle, [in] TRUSTED_INFORMATION_CLASS InformationClass, [in, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation); /* Function 28 */ - NTSTATUS LsarOpenSecret( + NTSTATUS __stdcall LsarOpenSecret( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING SecretName, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *SecretHandle); /* Function 29 */ - NTSTATUS LsarSetSecret( + NTSTATUS __stdcall LsarSetSecret( [in] LSAPR_HANDLE *SecretHandle, [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue, [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedOldValue); /* Function 30 */ - NTSTATUS LsarQuerySecret( + NTSTATUS __stdcall LsarQuerySecret( [in] LSAPR_HANDLE SecretHandle, [in, out, unique] PLSAPR_CR_CIPHER_VALUE *EncryptedCurrentValue, [in, out, unique] PLARGE_INTEGER CurrentValueSetTime, @@ -787,19 +787,19 @@ [in, out, unique] PLARGE_INTEGER OldValueSetTime); /* Function 31 */ - NTSTATUS LsarLookupPrivilegeValue( + NTSTATUS __stdcall LsarLookupPrivilegeValue( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING Name, [out] PLUID Value); /* Function 32 */ - NTSTATUS LsarLookupPrivilegeName( + NTSTATUS __stdcall LsarLookupPrivilegeName( [in] LSAPR_HANDLE PolicyHandle, [in] PLUID Value, [out] PRPC_UNICODE_STRING *Name); /* Function 33 */ - NTSTATUS LsarLookupPrivilegeDisplayName( + NTSTATUS __stdcall LsarLookupPrivilegeDisplayName( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING Name, [in] USHORT ClientLanguage, @@ -808,76 +808,76 @@ [out] USHORT *LanguageReturned); /* Function 34 */ - NTSTATUS LsarDeleteObject( + NTSTATUS __stdcall LsarDeleteObject( [in, out] LSAPR_HANDLE *ObjectHandle); cpp_quote("#if _WIN32_WINNT >= 0x0351") /* Function 35 */ - NTSTATUS LsarEnumerateAccountsWithUserRight( + NTSTATUS __stdcall LsarEnumerateAccountsWithUserRight( [in] LSAPR_HANDLE PolicyHandle, [in, unique] PRPC_UNICODE_STRING UserRight, [out] PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer); /* Function 36 */ - NTSTATUS LsarEnmuerateAccountRights( + NTSTATUS __stdcall LsarEnmuerateAccountRights( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [out] PLSAPR_USER_RIGHT_SET UserRights); /* Function 37 */ - NTSTATUS LsarAddAccountRights( + NTSTATUS __stdcall LsarAddAccountRights( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [in] PLSAPR_USER_RIGHT_SET UserRights); /* Function 38 */ - NTSTATUS LsarRemoveAccountRights( + NTSTATUS __stdcall LsarRemoveAccountRights( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, [in] BOOL AllRights, [in] PLSAPR_USER_RIGHT_SET UserRights); /* Function 39 */ - NTSTATUS LsarQueryTrustedDomainInfo( + NTSTATUS __stdcall LsarQueryTrustedDomainInfo( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID TrustedDomainSid, [in] TRUSTED_INFORMATION_CLASS InformationClass, [out, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation); /* Function 40 */ - NTSTATUS LsarSetTrustedDomainInfo( + NTSTATUS __stdcall LsarSetTrustedDomainInfo( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID TrustedDomainSid, [in] TRUSTED_INFORMATION_CLASS InformationClass, [in, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation); /* Function 41 */ - NTSTATUS LsarDeleteTrustedDomain( + NTSTATUS __stdcall LsarDeleteTrustedDomain( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID TrustedDomainSid); /* Function 42 */ - NTSTATUS LsarStorePrivateData( + NTSTATUS __stdcall LsarStorePrivateData( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING KeyName, [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedData); /* Function 43 */ - NTSTATUS LsarRetrievePrivateData( + NTSTATUS __stdcall LsarRetrievePrivateData( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING KeyName, [in, out] PLSAPR_CR_CIPHER_VALUE *EncryptedData); /* Function 44 */ - NTSTATUS LsarOpenPolicy2( + NTSTATUS __stdcall LsarOpenPolicy2( [in, unique, string] PLSAPR_SERVER_NAME SystemName, [in] PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *PolicyHandle); /* Function 45 */ - NTSTATUS LsarGetUserName( + NTSTATUS __stdcall LsarGetUserName( [in, unique, string] PLSAPR_SERVER_NAME SystemName, [in, out] PRPC_UNICODE_STRING *UserName, [in, out, unique] PRPC_UNICODE_STRING *DomainName); @@ -885,21 +885,21 @@ cpp_quote("#if _WIN32_WINNT >= 0x0500") /* Function 46 */ - NTSTATUS LsarQueryInformationPolicy2( + NTSTATUS __stdcall LsarQueryInformationPolicy2( [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [out] unsigned long *PolicyInformation); /* FIXME: should be [out, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION *PolicyInformation); */ /* Function 47 */ - NTSTATUS LsarSetInformationPolicy2( + NTSTATUS __stdcall LsarSetInformationPolicy2( [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [in] unsigned long PolicyInformation); /* FIXME: should be [in, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION PolicyInformation); */ /* Function 48 */ - NTSTATUS LsarQueryTrustedDomainInfoByName( + NTSTATUS __stdcall LsarQueryTrustedDomainInfoByName( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING TrustedDomainName, [in] POLICY_INFORMATION_CLASS InformationClass, @@ -907,7 +907,7 @@ /* FIXME: should be [out, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION *PolicyInformation); */ /* Function 49 */ - NTSTATUS LsarSetTrustedDomainInfoByName( + NTSTATUS __stdcall LsarSetTrustedDomainInfoByName( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING TrustedDomainName, [in] POLICY_INFORMATION_CLASS InformationClass, @@ -915,14 +915,14 @@ /* FIXME: should be [in, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION PolicyInformation); */ /* Function 50 */ - NTSTATUS LsarEnumerateTrustedDomainsEx( + NTSTATUS __stdcall LsarEnumerateTrustedDomainsEx( [in] LSAPR_HANDLE PolicyHandle, [in, out] DWORD *EnumerationContext, [out] PLSAPR_TRUSTED_ENUM_BUFFER_EX EnumerationBuffer, [in] DWORD PreferedMaximumLength); /* Function 51 */ - NTSTATUS LsarCreateTrustedDomainEx( + NTSTATUS __stdcall LsarCreateTrustedDomainEx( [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, [in] PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION AuthentificationInformation, @@ -930,36 +930,36 @@ [out] LSAPR_HANDLE *TrustedDomainHandle); /* Function 52 */ - NTSTATUS LsarSetPolicyReplicationHandle( + NTSTATUS __stdcall LsarSetPolicyReplicationHandle( [in, out] PLSAPR_HANDLE PolicyHandle); /* Function 53 */ - NTSTATUS LsarQueryDomainInformationPolicy( + NTSTATUS __stdcall LsarQueryDomainInformationPolicy( [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [out] unsigned long *PolicyInformation); /* FIXME: should be [out, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION *PolicyInformation); */ /* Function 54 */ - NTSTATUS LsarSetDomainInformationPolicy( + NTSTATUS __stdcall LsarSetDomainInformationPolicy( [in] LSAPR_HANDLE PolicyHandle, [in] POLICY_INFORMATION_CLASS InformationClass, [in] unsigned long PolicyInformation); /* FIXME: should be [in, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION PolicyInformation); */ /* Function 55 */ - NTSTATUS LsarOpenTrustedDomainByName( + NTSTATUS __stdcall LsarOpenTrustedDomainByName( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_UNICODE_STRING TrustedDomainName, [in] ACCESS_MASK DesiredAccess, [out] LSAPR_HANDLE *TrustedDomainHandle); /* Function 56 */ - NTSTATUS LsarTestCall( + NTSTATUS __stdcall LsarTestCall( [in] handle_t hBinding); /* FIXME */ /* Function 57 */ - NTSTATUS LsarLookupSids2( + NTSTATUS __stdcall LsarLookupSids2( [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -970,7 +970,7 @@ [in] DWORD ClientRevision); /* Function 58 */ - NTSTATUS LsarLookupNames2( + NTSTATUS __stdcall LsarLookupNames2( [in] LSAPR_HANDLE PolicyHandle, [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, @@ -982,7 +982,7 @@ [in] DWORD ClientRevision); /* Function 59 */ - NTSTATUS LsarCreateTrustedDomainEx2( + NTSTATUS __stdcall LsarCreateTrustedDomainEx2( [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, [in] PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION_INTERNAL AuthentificationInformation, @@ -992,39 +992,39 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501") /* Function 60 */ - NTSTATUS CredrWrite( + NTSTATUS __stdcall CredrWrite( [in] handle_t hBinding); /* FIXME */ /* Function 61 */ - NTSTATUS CredrRead( + NTSTATUS __stdcall CredrRead( [in] handle_t hBinding); /* FIXME */ /* Function 62 */ - NTSTATUS CredrEnumerate( + NTSTATUS __stdcall CredrEnumerate( [in] handle_t hBinding); /* FIXME */ /* Function 63 */ - NTSTATUS CredrWriteDomainCredentials( + NTSTATUS __stdcall CredrWriteDomainCredentials( [in] handle_t hBinding); /* FIXME */ /* Function 64 */ - NTSTATUS CredrReadDomainCredentials( + NTSTATUS __stdcall CredrReadDomainCredentials( [in] handle_t hBinding); /* FIXME */ /* Function 65 */ - NTSTATUS CredrDelete( + NTSTATUS __stdcall CredrDelete( [in] handle_t hBinding); /* FIXME */ /* Function 66 */ - NTSTATUS CredrGetTargetInfo( + NTSTATUS __stdcall CredrGetTargetInfo( [in] handle_t hBinding); /* FIXME */ /* Function 67 */ - NTSTATUS CredrProfileLoaded( + NTSTATUS __stdcall CredrProfileLoaded( [in] handle_t hBinding); /* FIXME */ /* Function 68 */ - NTSTATUS LsarLookupNames3( + NTSTATUS __stdcall LsarLookupNames3( [in] LSAPR_HANDLE PolicyHandle, [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, @@ -1036,30 +1036,30 @@ [in] DWORD ClientRevision); /* Function 69 */ - NTSTATUS CredrGetSessionTypes( + NTSTATUS __stdcall CredrGetSessionTypes( [in] handle_t hBinding); /* FIXME */ /* Function 70 */ - NTSTATUS LsarRegisterAuditEvent( + NTSTATUS __stdcall LsarRegisterAuditEvent( [in] handle_t hBinding); /* FIXME */ /* Function 71 */ - NTSTATUS LsarGenAuditEvent( + NTSTATUS __stdcall LsarGenAuditEvent( [in] handle_t hBinding); /* FIXME */ /* Function 72 */ - NTSTATUS LsarUnregisterAuditEvent( + NTSTATUS __stdcall LsarUnregisterAuditEvent( [in] handle_t hBinding); /* FIXME */ /* Function 73 */ - NTSTATUS LsarQueryForestTrustInformation( + NTSTATUS __stdcall LsarQueryForestTrustInformation( [in] LSAPR_HANDLE PolicyHandle, [in] PLSA_UNICODE_STRING TrustedDomainName, [in] LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, [out] PLSA_FOREST_TRUST_INFORMATION *ForestTrustInfo); /* Function 74 */ - NTSTATUS LsarSetForestTrustInformation( + NTSTATUS __stdcall LsarSetForestTrustInformation( [in] LSAPR_HANDLE PolicyHandle, [in] PLSA_UNICODE_STRING TrustedDomainName, [in] LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, @@ -1068,11 +1068,11 @@ [out] PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo); /* Function 75 */ - NTSTATUS CredrRename( + NTSTATUS __stdcall CredrRename( [in] handle_t hBinding); /* FIXME */ /* Function 76 */ - NTSTATUS LsarLookupSids3( + NTSTATUS __stdcall LsarLookupSids3( [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -1083,7 +1083,7 @@ [in] DWORD ClientRevision); /* Function 77 */ - NTSTATUS LsarLookupNames4( + NTSTATUS __stdcall LsarLookupNames4( [in] LSAPR_HANDLE PolicyHandle, [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, @@ -1095,19 +1095,19 @@ [in] DWORD ClientRevision); /* Function 78 */ - NTSTATUS LsarOpenPolicySce( + NTSTATUS __stdcall LsarOpenPolicySce( [in] handle_t hBinding); /* FIXME */ /* Function 79 */ - NTSTATUS LsarAdtRegisterSecurityEventSource( + NTSTATUS __stdcall LsarAdtRegisterSecurityEventSource( [in] handle_t hBinding); /* FIXME */ /* Function 80 */ - NTSTATUS LsarAdtUnregisterSecurityEventSource( + NTSTATUS __stdcall LsarAdtUnregisterSecurityEventSource( [in] handle_t hBinding); /* FIXME */ /* Function 81 */ - NTSTATUS LsarAdtReportSecurityEvent( + NTSTATUS __stdcall LsarAdtReportSecurityEvent( [in] handle_t hBinding); /* FIXME */ cpp_quote("#endif /* _WIN32_WINNT >= 0x0501 */")

1 0

[ekohl] 49164: [ADVAPI32] Implement LsaCreateAccount(), LsaOpenAccount() and LsaSetInformationPolicy().
by ekohl＠svn.reactos.org 16 Oct '10

16 Oct '10

Author: ekohl Date: Sat Oct 16 09:41:47 2010 New Revision: 49164 URL: http://svn.reactos.org/svn/reactos?rev=49164&view=rev Log: [ADVAPI32] Implement LsaCreateAccount(), LsaOpenAccount() and LsaSetInformationPolicy(). Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Sat Oct 16 09:41:47 2010 @@ -348,7 +348,7 @@ @ stub LsaAddPrivilegesToAccount @ stub LsaClearAuditLog @ stdcall LsaClose(ptr) -@ stub LsaCreateAccount +@ stdcall LsaCreateAccount(ptr ptr long ptr) @ stub LsaCreateSecret @ stub LsaCreateTrustedDomain @ stdcall LsaCreateTrustedDomainEx(ptr ptr ptr long ptr) @@ -377,8 +377,8 @@ @ stdcall LsaLookupPrivilegeValue(ptr ptr ptr) @ stdcall LsaLookupSids(ptr long ptr ptr ptr) @ stdcall LsaNtStatusToWinError(long) -@ stub LsaOpenAccount -@ stdcall LsaOpenPolicy(long long long long) +@ stdcall LsaOpenAccount(ptr ptr long ptr) +@ stdcall LsaOpenPolicy(ptr ptr long ptr) @ stub LsaOpenPolicySce @ stub LsaOpenSecret @ stub LsaOpenTrustedDomain 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 Oct 16 09:41:47 2010 @@ -155,6 +155,38 @@ return STATUS_OBJECT_NAME_NOT_FOUND; } + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaCreateAccount(IN LSA_HANDLE PolicyHandle, + IN PSID AccountSid, + IN ULONG Flags, + IN OUT PLSA_HANDLE AccountHandle) +{ + NTSTATUS Status; + + TRACE("(%p,%p,0x%08x,%p)\n", PolicyHandle, AccountSid, Flags, AccountHandle); + + RpcTryExcept + { + Status = LsarCreateAccount((LSAPR_HANDLE)PolicyHandle, + AccountSid, + Flags, + AccountHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + /* * @unimplemented */ @@ -499,6 +531,38 @@ TRACE("(%lx)\n", Status); return RtlNtStatusToDosError(Status); } + + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaOpenAccount(IN LSA_HANDLE PolicyHandle, + IN PSID AccountSid, + IN ULONG Flags, + IN OUT PLSA_HANDLE AccountHandle) +{ + NTSTATUS Status; + + TRACE("(%p,%p,0x%08x,%p)\n", PolicyHandle, AccountSid, Flags, AccountHandle); + + RpcTryExcept + { + Status = LsarOpenAccount((LSAPR_HANDLE)PolicyHandle, + AccountSid, + Flags, + AccountHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + /****************************************************************************** * LsaOpenPolicy @@ -701,19 +765,35 @@ return STATUS_UNSUCCESSFUL; } -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaSetInformationPolicy( - LSA_HANDLE PolicyHandle, - POLICY_INFORMATION_CLASS InformationClass, - PVOID Buffer) -{ - FIXME("(%p,0x%08x,%p) stub\n", PolicyHandle, InformationClass, Buffer); - return STATUS_UNSUCCESSFUL; -} + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaSetInformationPolicy(IN LSA_HANDLE PolicyHandle, + IN POLICY_INFORMATION_CLASS InformationClass, + IN PVOID Buffer) +{ + NTSTATUS Status; + + TRACE("(%p,0x%08x,%p)\n", PolicyHandle, InformationClass, Buffer); + + RpcTryExcept + { + Status = LsarSetInformationPolicy((LSAPR_HANDLE)PolicyHandle, + InformationClass, + (PLSAPR_POLICY_INFORMATION)Buffer); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + /* * @unimplemented 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 Oct 16 09:41:47 2010 @@ -675,6 +675,7 @@ PULONG,PNTSTATUS); NTSTATUS NTAPI LsaClose(LSA_HANDLE); NTSTATUS NTAPI LsaConnectUntrusted(PHANDLE); +NTSTATUS NTAPI LsaCreateAccount(LSA_HANDLE, PSID, ULONG, PLSA_HANDLE); NTSTATUS NTAPI LsaCreateTrustedDomainEx(LSA_HANDLE, PTRUSTED_DOMAIN_INFORMATION_EX, PTRUSTED_DOMAIN_AUTH_INFORMATION,ACCESS_MASK, @@ -703,6 +704,7 @@ NTSTATUS NTAPI LsaLookupSids(LSA_HANDLE,ULONG,PSID*, PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_NAME*); ULONG NTAPI LsaNtStatusToWinError(NTSTATUS); +NTSTATUS NTAPI LsaOpenAccount(LSA_HANDLE, PSID, ULONG, PLSA_HANDLE); NTSTATUS NTAPI LsaOpenPolicy(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES, ACCESS_MASK,PLSA_HANDLE); NTSTATUS NTAPI LsaQueryDomainInformationPolicy(LSA_HANDLE,

1 0

[ekohl] 49163: [LSASRV] Add ServiceInit() stub and call it from lsass.
by ekohl＠svn.reactos.org 16 Oct '10

16 Oct '10

Author: ekohl Date: Sat Oct 16 08:48:25 2010 New Revision: 49163 URL: http://svn.reactos.org/svn/reactos?rev=49163&view=rev Log: [LSASRV] Add ServiceInit() stub and call it from lsass. Modified: trunk/reactos/base/system/lsass/lsass.c trunk/reactos/dll/win32/lsasrv/lsasrv.c trunk/reactos/dll/win32/lsasrv/lsasrv.spec trunk/reactos/include/reactos/subsys/lsass/lsasrv.h Modified: trunk/reactos/base/system/lsass/lsass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/lsass/lsass.c?… ============================================================================== --- trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] (original) +++ trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] Sat Oct 16 08:48:25 2010 @@ -55,6 +55,14 @@ goto ByeBye; } + /* Start the Netlogon service. */ + Status = ServiceInit(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ServiceInit() failed (Status 0x%08lX)\n", Status); + goto ByeBye; + } + #if 0 /* Initialize the SAM server DLL. */ Status = SamIInitialize(); Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Sat Oct 16 08:48:25 2010 @@ -64,6 +64,14 @@ } +NTSTATUS WINAPI +ServiceInit(VOID) +{ + TRACE("ServiceInit() called\n"); + return STATUS_SUCCESS; +} + + void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) { return RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, len); Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.sp… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] Sat Oct 16 08:48:25 2010 @@ -62,4 +62,4 @@ @ stub LsarSetSecret @ stub LsarSetSecurityObject @ stub LsarSetSystemAccessAccount - @ stub ServiceInit + @ stdcall ServiceInit() Modified: trunk/reactos/include/reactos/subsys/lsass/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/lsa… ============================================================================== --- trunk/reactos/include/reactos/subsys/lsass/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/lsass/lsasrv.h [iso-8859-1] Sat Oct 16 08:48:25 2010 @@ -5,4 +5,7 @@ NTSTATUS WINAPI LsapInitLsa(VOID); +NTSTATUS WINAPI +ServiceInit(VOID); + #endif /* __LSASRV_H */

1 0

[cgutman] 49162: [SCSIPORT] - Implement support for 2 interrupts - Halfplement support for 2 DMA channels - Set/Read the CM_RESOURCE_DMA flags - Remove a duplicate spin lock initialization - Partia...
by cgutman＠svn.reactos.org 15 Oct '10

15 Oct '10

Author: cgutman Date: Fri Oct 15 21:38:00 2010 New Revision: 49162 URL: http://svn.reactos.org/svn/reactos?rev=49162&view=rev Log: [SCSIPORT] - Implement support for 2 interrupts - Halfplement support for 2 DMA channels - Set/Read the CM_RESOURCE_DMA flags - Remove a duplicate spin lock initialization - Partially tested with 2 interrupts in use but UniATA seems to be broken because it registers both interrupts for each channel even though they are not sharable which causes it to fail when initializing the secondary IDE channel Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c trunk/reactos/drivers/storage/scsiport/scsiport_int.h Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Fri Oct 15 21:38:00 2010 @@ -1041,10 +1041,8 @@ WCHAR DosNameBuffer[80]; UNICODE_STRING DosDeviceName; PIO_SCSI_CAPABILITIES PortCapabilities; - ULONG MappedIrq; - KIRQL Dirql; - KAFFINITY Affinity; - + + KIRQL OldIrql; PCM_RESOURCE_LIST ResourceList; BOOLEAN Conflict; @@ -1137,6 +1135,7 @@ /* Fill Device Extension */ DeviceExtension = PortDeviceObject->DeviceExtension; + RtlZeroMemory(DeviceExtension, DeviceExtensionSize); DeviceExtension->Length = DeviceExtensionSize; DeviceExtension->DeviceObject = PortDeviceObject; DeviceExtension->PortNumber = SystemConfig->ScsiPortCount; @@ -1509,45 +1508,55 @@ (PortConfig->BusInterruptLevel == 0 && PortConfig->BusInterruptVector == 0)) { /* No interrupts */ - KeInitializeSpinLock(&DeviceExtension->IrqLock); - - /* FIXME: Use synchronization routine */ - ASSERT("No interrupts branch requires changes in synchronization\n"); - - DeviceExtension->Interrupt = (PVOID)DeviceExtension; - DPRINT("No interrupts\n"); - + DeviceExtension->InterruptCount = 0; + + DPRINT1("Interrupt Count: 0\n"); + + UNIMPLEMENTED; + + /* This code path will ALWAYS crash so stop it now */ + while(TRUE); } else { - /* Are 2 interrupts needed? */ - if (DeviceExtension->HwInterrupt != NULL && - (PortConfig->BusInterruptLevel != 0 || PortConfig->BusInterruptVector != 0) && - (PortConfig->BusInterruptLevel2 != 0 || PortConfig->BusInterruptVector2 != 0)) + BOOLEAN InterruptShareable; + KINTERRUPT_MODE InterruptMode[2]; + ULONG InterruptVector[2], i, MappedIrq[2]; + KIRQL Dirql[2], MaxDirql; + KAFFINITY Affinity[2]; + + DeviceExtension->InterruptLevel[0] = PortConfig->BusInterruptLevel; + DeviceExtension->InterruptLevel[1] = PortConfig->BusInterruptLevel2; + + InterruptVector[0] = PortConfig->BusInterruptVector; + InterruptVector[1] = PortConfig->BusInterruptVector2; + + InterruptMode[0] = PortConfig->InterruptMode; + InterruptMode[1] = PortConfig->InterruptMode2; + + DeviceExtension->InterruptCount = (PortConfig->BusInterruptLevel2 != 0 || PortConfig->BusInterruptVector2 != 0) ? 2 : 1; + + for (i = 0; i < DeviceExtension->InterruptCount; i++) { - DPRINT1("2 interrupts requested! Not yet supported\n"); - ASSERT(FALSE); + /* Register an interrupt handler for this device */ + MappedIrq[i] = HalGetInterruptVector(PortConfig->AdapterInterfaceType, + PortConfig->SystemIoBusNumber, + DeviceExtension->InterruptLevel[i], + InterruptVector[i], + &Dirql[i], + &Affinity[i]); } + + if (DeviceExtension->InterruptCount == 1 || Dirql[0] > Dirql[1]) + MaxDirql = Dirql[0]; else + MaxDirql = Dirql[1]; + + for (i = 0; i < DeviceExtension->InterruptCount; i++) { - BOOLEAN InterruptShareable; - - /* No, only 1 interrupt */ - DPRINT("1 interrupt, IRQ is %d\n", PortConfig->BusInterruptLevel); - - DeviceExtension->InterruptLevel = PortConfig->BusInterruptLevel; - - /* Register an interrupt handler for this device */ - MappedIrq = HalGetInterruptVector(PortConfig->AdapterInterfaceType, - PortConfig->SystemIoBusNumber, - PortConfig->BusInterruptLevel, - PortConfig->BusInterruptVector, - &Dirql, - &Affinity); - /* Determing IRQ sharability as usual */ if (PortConfig->AdapterInterfaceType == MicroChannel || - PortConfig->InterruptMode == LevelSensitive) + InterruptMode[i] == LevelSensitive) { InterruptShareable = TRUE; } @@ -1556,27 +1565,29 @@ InterruptShareable = FALSE; } - Status = IoConnectInterrupt(&DeviceExtension->Interrupt, + Status = IoConnectInterrupt(&DeviceExtension->Interrupt[i], (PKSERVICE_ROUTINE)ScsiPortIsr, DeviceExtension, - NULL, - MappedIrq, - Dirql, - Dirql, - PortConfig->InterruptMode, + &DeviceExtension->IrqLock, + MappedIrq[i], + Dirql[i], + MaxDirql, + InterruptMode[i], InterruptShareable, - Affinity, + Affinity[i], FALSE); if (!(NT_SUCCESS(Status))) { DPRINT1("Could not connect interrupt %d\n", - PortConfig->BusInterruptVector); - DeviceExtension->Interrupt = NULL; + InterruptVector[i]); + DeviceExtension->Interrupt[i] = NULL; break; } - } + + if (!NT_SUCCESS(Status)) + break; } /* Save IoAddress (from access ranges) */ @@ -1607,14 +1618,14 @@ } /* Call HwInitialize at DISPATCH_LEVEL */ - KeRaiseIrql(DISPATCH_LEVEL, &Dirql); - - if (!KeSynchronizeExecution(DeviceExtension->Interrupt, + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + if (!KeSynchronizeExecution(DeviceExtension->Interrupt[0], DeviceExtension->HwInitialize, DeviceExtension->MiniPortDeviceExtension)) { DPRINT1("HwInitialize() failed!\n"); - KeLowerIrql(Dirql); + KeLowerIrql(OldIrql); Status = STATUS_ADAPTER_HARDWARE_ERROR; break; } @@ -1630,7 +1641,7 @@ } /* Lower irql back to what it was */ - KeLowerIrql(Dirql); + KeLowerIrql(OldIrql); /* Start our timer */ IoStartTimer(PortDeviceObject); @@ -1720,11 +1731,14 @@ if (DeviceExtension == NULL) return; - /* Stop the timer and disconnect the interrupt */ - if (DeviceExtension->Interrupt) - { - IoStopTimer(DeviceExtension->DeviceObject); - IoDisconnectInterrupt(DeviceExtension->Interrupt); + /* Stop the timer */ + IoStopTimer(DeviceExtension->DeviceObject); + + /* Disconnect the interrupts */ + while (DeviceExtension->InterruptCount) + { + if (DeviceExtension->Interrupt[--DeviceExtension->InterruptCount]) + IoDisconnectInterrupt(DeviceExtension->Interrupt[DeviceExtension->InterruptCount]); } /* Delete ConfigInfo */ @@ -2042,6 +2056,8 @@ PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialData; ULONG RangeNumber; ULONG Index; + ULONG Interrupt = 0; + ULONG Dma = 0; RangeNumber = 0; @@ -2081,24 +2097,71 @@ break; case CmResourceTypeInterrupt: - /* Copy interrupt data */ - PortConfig->BusInterruptLevel = PartialData->u.Interrupt.Level; - PortConfig->BusInterruptVector = PartialData->u.Interrupt.Vector; - - /* Set interrupt mode accordingly to the resource */ - if (PartialData->Flags == CM_RESOURCE_INTERRUPT_LATCHED) + + if (Interrupt == 0) { - PortConfig->InterruptMode = Latched; + /* Copy interrupt data */ + PortConfig->BusInterruptLevel = PartialData->u.Interrupt.Level; + PortConfig->BusInterruptVector = PartialData->u.Interrupt.Vector; + + /* Set interrupt mode accordingly to the resource */ + if (PartialData->Flags == CM_RESOURCE_INTERRUPT_LATCHED) + { + PortConfig->InterruptMode = Latched; + } + else if (PartialData->Flags == CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE) + { + PortConfig->InterruptMode = LevelSensitive; + } } - else if (PartialData->Flags == CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE) + else if (Interrupt == 1) { - PortConfig->InterruptMode = LevelSensitive; + /* Copy interrupt data */ + PortConfig->BusInterruptLevel2 = PartialData->u.Interrupt.Level; + PortConfig->BusInterruptVector2 = PartialData->u.Interrupt.Vector; + + /* Set interrupt mode accordingly to the resource */ + if (PartialData->Flags == CM_RESOURCE_INTERRUPT_LATCHED) + { + PortConfig->InterruptMode2 = Latched; + } + else if (PartialData->Flags == CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE) + { + PortConfig->InterruptMode2 = LevelSensitive; + } } + + Interrupt++; break; case CmResourceTypeDma: - PortConfig->DmaChannel = PartialData->u.Dma.Channel; - PortConfig->DmaPort = PartialData->u.Dma.Port; + + if (Dma == 0) + { + PortConfig->DmaChannel = PartialData->u.Dma.Channel; + PortConfig->DmaPort = PartialData->u.Dma.Port; + + if (PartialData->Flags & CM_RESOURCE_DMA_8) + PortConfig->DmaWidth = Width8Bits; + else if ((PartialData->Flags & CM_RESOURCE_DMA_16) || + (PartialData->Flags & CM_RESOURCE_DMA_8_AND_16)) //??? + PortConfig->DmaWidth = Width16Bits; + else if (PartialData->Flags & CM_RESOURCE_DMA_32) + PortConfig->DmaWidth = Width32Bits; + } + else if (Dma == 1) + { + PortConfig->DmaChannel = PartialData->u.Dma.Channel; + PortConfig->DmaPort = PartialData->u.Dma.Port; + + if (PartialData->Flags & CM_RESOURCE_DMA_8) + PortConfig->DmaWidth2 = Width8Bits; + else if ((PartialData->Flags & CM_RESOURCE_DMA_16) || + (PartialData->Flags & CM_RESOURCE_DMA_8_AND_16)) //??? + PortConfig->DmaWidth2 = Width16Bits; + else if (PartialData->Flags & CM_RESOURCE_DMA_32) + PortConfig->DmaWidth2 = Width32Bits; + } break; } } @@ -2112,9 +2175,8 @@ PCM_RESOURCE_LIST ResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; PACCESS_RANGE AccessRange; - BOOLEAN Dma; ULONG ListLength = 0, i, FullSize; - ULONG Interrupt; + ULONG Interrupt, Dma; /* Get current Atdisk usage from the system */ ConfigInfo = IoGetConfigurationInformation(); @@ -2129,34 +2191,21 @@ if (PortConfig->DmaChannel != SP_UNINITIALIZED_VALUE || PortConfig->DmaPort != SP_UNINITIALIZED_VALUE) { - Dma = TRUE; - ListLength++; + Dma = 1; + + if (PortConfig->DmaChannel != SP_UNINITIALIZED_VALUE || + PortConfig->DmaPort != SP_UNINITIALIZED_VALUE) + Dma++; } else { - Dma = FALSE; - } + Dma = 0; + } + ListLength += Dma; /* How many interrupts to we have? */ - if (DeviceExtension->HwInterrupt == NULL || - (PortConfig->BusInterruptLevel == 0 && - PortConfig->BusInterruptVector == 0)) - { - Interrupt = 0; - } - else - { - Interrupt = 1; - ListLength++; - } - - if (DeviceExtension->HwInterrupt != NULL && - (PortConfig->BusInterruptLevel2 != 0 || - PortConfig->BusInterruptVector2 != 0)) - { - Interrupt++; - ListLength++; - } + Interrupt = DeviceExtension->InterruptCount; + ListLength += Interrupt; /* How many access ranges do we use? */ AccessRange = &((*(PortConfig->AccessRanges))[0]); @@ -2221,7 +2270,7 @@ ResourceDescriptor->Type = CmResourceTypeInterrupt; if (PortConfig->AdapterInterfaceType == MicroChannel || - PortConfig->InterruptMode == LevelSensitive) + ((Interrupt == 2) ? PortConfig->InterruptMode2 : PortConfig->InterruptMode) == LevelSensitive) { ResourceDescriptor->ShareDisposition = CmResourceShareShared; ResourceDescriptor->Flags = CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE; @@ -2241,19 +2290,29 @@ } /* Copy DMA data */ - if (Dma) + while (Dma) { ResourceDescriptor->Type = CmResourceTypeDma; ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; - ResourceDescriptor->u.Dma.Channel = PortConfig->DmaChannel; - ResourceDescriptor->u.Dma.Port = PortConfig->DmaPort; + ResourceDescriptor->u.Dma.Channel = (Dma == 2) ? PortConfig->DmaChannel2 : PortConfig->DmaChannel; + ResourceDescriptor->u.Dma.Port = (Dma == 2) ? PortConfig->DmaPort2 : PortConfig->DmaPort; ResourceDescriptor->Flags = 0; - - if (PortConfig->DmaChannel == SP_UNINITIALIZED_VALUE) + + if (((Dma == 2) ? PortConfig->DmaWidth2 : PortConfig->DmaWidth) == Width8Bits) + ResourceDescriptor->Flags |= CM_RESOURCE_DMA_8; + else if (((Dma == 2) ? PortConfig->DmaWidth2 : PortConfig->DmaWidth) == Width16Bits) + ResourceDescriptor->Flags |= CM_RESOURCE_DMA_16; + else + ResourceDescriptor->Flags |= CM_RESOURCE_DMA_32; + + if (((Dma == 2) ? PortConfig->DmaChannel2 : PortConfig->DmaChannel) == SP_UNINITIALIZED_VALUE) ResourceDescriptor->u.Dma.Channel = 0; - if (PortConfig->DmaPort == SP_UNINITIALIZED_VALUE) + if (((Dma == 2) ? PortConfig->DmaPort2 : PortConfig->DmaPort) == SP_UNINITIALIZED_VALUE) ResourceDescriptor->u.Dma.Port = 0; + + ResourceDescriptor++; + Dma--; } return ResourceList; @@ -2981,7 +3040,7 @@ KeAcquireSpinLockAtDpcLevel(&DeviceExtension->SpinLock); - if (!KeSynchronizeExecution(DeviceExtension->Interrupt, + if (!KeSynchronizeExecution(DeviceExtension->Interrupt[0], ScsiPortStartPacket, DeviceObject)) { @@ -3234,7 +3293,7 @@ /* Schedule an active request */ InterlockedIncrement(&DeviceExtension->ActiveRequestCounter ); KeAcquireSpinLock(&DeviceExtension->SpinLock, &CurrentIrql); - KeSynchronizeExecution(DeviceExtension->Interrupt, + KeSynchronizeExecution(DeviceExtension->Interrupt[0], ScsiPortStartPacket, DeviceObject); KeReleaseSpinLock(&DeviceExtension->SpinLock, CurrentIrql); @@ -4796,7 +4855,7 @@ Context.InterruptData = &InterruptData; Context.DeviceExtension = DeviceExtension; - if (!KeSynchronizeExecution(DeviceExtension->Interrupt, + if (!KeSynchronizeExecution(DeviceExtension->Interrupt[0], SpiSaveInterruptData, &Context)) { @@ -5089,7 +5148,7 @@ if (DeviceExtension->TimerCount == 0) { /* Timeout, process it */ - if (KeSynchronizeExecution(DeviceExtension->Interrupt, + if (KeSynchronizeExecution(DeviceExtension->Interrupt[0], SpiProcessTimeout, DeviceExtension->DeviceObject)) { @@ -5143,7 +5202,7 @@ ResetParams.PathId = LunExtension->PathId; ResetParams.DeviceExtension = DeviceExtension; - if (!KeSynchronizeExecution(DeviceExtension->Interrupt, + if (!KeSynchronizeExecution(DeviceExtension->Interrupt[0], SpiResetBus, &ResetParams)) { @@ -5654,6 +5713,8 @@ ConfigInfo->InterruptMode = Latched; ConfigInfo->DmaChannel = SP_UNINITIALIZED_VALUE; ConfigInfo->DmaPort = SP_UNINITIALIZED_VALUE; + ConfigInfo->DmaChannel2 = SP_UNINITIALIZED_VALUE; + ConfigInfo->DmaPort2 = SP_UNINITIALIZED_VALUE; ConfigInfo->MaximumTransferLength = SP_UNINITIALIZED_VALUE; ConfigInfo->NumberOfAccessRanges = HwInitData->NumberOfAccessRanges; ConfigInfo->MaximumNumberOfTargets = 8; @@ -5876,11 +5937,12 @@ PCM_FULL_RESOURCE_DESCRIPTOR FullResource; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCM_SCSI_DEVICE_DATA ScsiDeviceData; - ULONG Length, Count; + ULONG Length, Count, Dma = 0, Interrupt = 0; ULONG Index = 0, RangeCount = 0; UNICODE_STRING UnicodeString; ANSI_STRING AnsiString; NTSTATUS Status = STATUS_SUCCESS; + KeyValueInformation = (PKEY_VALUE_FULL_INFORMATION) Buffer; @@ -6169,16 +6231,61 @@ break; case CmResourceTypeInterrupt: - ConfigInfo->BusInterruptLevel = + + if (Interrupt == 0) + { + ConfigInfo->BusInterruptLevel = + PartialDescriptor->u.Interrupt.Level; + + ConfigInfo->BusInterruptVector = + PartialDescriptor->u.Interrupt.Vector; + + ConfigInfo->InterruptMode = (PartialDescriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED) ? Latched : LevelSensitive; + } + else if (Interrupt == 1) + { + ConfigInfo->BusInterruptLevel2 = PartialDescriptor->u.Interrupt.Level; - ConfigInfo->BusInterruptVector = + ConfigInfo->BusInterruptVector2 = PartialDescriptor->u.Interrupt.Vector; + + ConfigInfo->InterruptMode2 = (PartialDescriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED) ? Latched : LevelSensitive; + } + + Interrupt++; break; case CmResourceTypeDma: - ConfigInfo->DmaChannel = PartialDescriptor->u.Dma.Channel; - ConfigInfo->DmaPort = PartialDescriptor->u.Dma.Port; + + if (Dma == 0) + { + ConfigInfo->DmaChannel = PartialDescriptor->u.Dma.Channel; + ConfigInfo->DmaPort = PartialDescriptor->u.Dma.Port; + + if (PartialDescriptor->Flags & CM_RESOURCE_DMA_8) + ConfigInfo->DmaWidth = Width8Bits; + else if ((PartialDescriptor->Flags & CM_RESOURCE_DMA_16) || + (PartialDescriptor->Flags & CM_RESOURCE_DMA_8_AND_16)) //??? + ConfigInfo->DmaWidth = Width16Bits; + else if (PartialDescriptor->Flags & CM_RESOURCE_DMA_32) + ConfigInfo->DmaWidth = Width32Bits; + } + else if (Dma == 1) + { + ConfigInfo->DmaChannel2 = PartialDescriptor->u.Dma.Channel; + ConfigInfo->DmaPort2 = PartialDescriptor->u.Dma.Port; + + if (PartialDescriptor->Flags & CM_RESOURCE_DMA_8) + ConfigInfo->DmaWidth2 = Width8Bits; + else if ((PartialDescriptor->Flags & CM_RESOURCE_DMA_16) || + (PartialDescriptor->Flags & CM_RESOURCE_DMA_8_AND_16)) //??? + ConfigInfo->DmaWidth2 = Width16Bits; + else if (PartialDescriptor->Flags & CM_RESOURCE_DMA_32) + ConfigInfo->DmaWidth2 = Width32Bits; + } + + Dma++; break; case CmResourceTypeDeviceSpecific: @@ -6240,7 +6347,7 @@ DeviceExtension->MapRegisterBase = MapRegisterBase; /* Start pending request */ - KeSynchronizeExecution(DeviceExtension->Interrupt, + KeSynchronizeExecution(DeviceExtension->Interrupt[0], ScsiPortStartPacket, DeviceObject); /* Release spinlock we took */ Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport_int.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport_int.h [iso-8859-1] Fri Oct 15 21:38:00 2010 @@ -222,7 +222,7 @@ KSPIN_LOCK IrqLock; /* Used when there are 2 irqs */ ULONG SequenceNumber; /* Global sequence number for packets */ KSPIN_LOCK SpinLock; - PKINTERRUPT Interrupt; + PKINTERRUPT Interrupt[2]; PIRP CurrentIrp; ULONG IrpFlags; @@ -281,13 +281,15 @@ PHYSICAL_ADDRESS PhysicalAddress; ULONG CommonBufferLength; - ULONG InterruptLevel; + ULONG InterruptLevel[2]; ULONG IoAddress; BOOLEAN NeedSrbExtensionAlloc; BOOLEAN NeedSrbDataAlloc; ULONG RequestsNumber; + + ULONG InterruptCount; UCHAR MiniPortDeviceExtension[1]; /* must be the last entry */ } SCSI_PORT_DEVICE_EXTENSION, *PSCSI_PORT_DEVICE_EXTENSION;

1 0

[ekohl] 49161: [ADVAPI32/LSASRV] - Prepare LsapValidateDbHandle for access checks. - Move the functionality of LsaQueryInformationPolicy (advapi32.dll) into the new function LsarQueryInformationPol...
by ekohl＠svn.reactos.org 15 Oct '10

15 Oct '10

Author: ekohl Date: Fri Oct 15 21:28:42 2010 New Revision: 49161 URL: http://svn.reactos.org/svn/reactos?rev=49161&view=rev Log: [ADVAPI32/LSASRV] - Prepare LsapValidateDbHandle for access checks. - Move the functionality of LsaQueryInformationPolicy (advapi32.dll) into the new function LsarQueryInformationPolicy (lsasrv.dll). - Remove dead code from advapi32.dll. Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/lsasrv/lsarpc.c 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] Fri Oct 15 21:28:42 2010 @@ -16,59 +16,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); -/* imported from wine 1.1.14 */ -static void* ADVAPI_GetDomainName(unsigned sz, unsigned ofs) -{ - HKEY key; - LONG ret; - BYTE* ptr = NULL; - UNICODE_STRING* ustr; - - static const WCHAR wVNETSUP[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'S','e','r','v','i','c','e','s','\\', - 'V','x','D','\\','V','N','E','T','S','U','P','\0'}; - - ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, wVNETSUP, 0, KEY_READ, &key); - if (ret == ERROR_SUCCESS) - { - DWORD size = 0; - static const WCHAR wg[] = { 'W','o','r','k','g','r','o','u','p',0 }; - - ret = RegQueryValueExW(key, wg, NULL, NULL, NULL, &size); - if (ret == ERROR_MORE_DATA || ret == ERROR_SUCCESS) - { - ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sz + size); - if (!ptr) return NULL; - ustr = (UNICODE_STRING*)(ptr + ofs); - ustr->MaximumLength = size; - ustr->Buffer = (WCHAR*)(ptr + sz); - ret = RegQueryValueExW(key, wg, NULL, NULL, (LPBYTE)ustr->Buffer, &size); - if (ret != ERROR_SUCCESS) - { - HeapFree(GetProcessHeap(), 0, ptr); - ptr = NULL; - } - else ustr->Length = size - sizeof(WCHAR); - } - RegCloseKey(key); - } - if (!ptr) - { - static const WCHAR wDomain[] = {'D','O','M','A','I','N','\0'}; - ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sz + sizeof(wDomain)); - if (!ptr) return NULL; - ustr = (UNICODE_STRING*)(ptr + ofs); - ustr->MaximumLength = sizeof(wDomain); - ustr->Buffer = (WCHAR*)(ptr + sz); - ustr->Length = sizeof(wDomain) - sizeof(WCHAR); - memcpy(ustr->Buffer, wDomain, sizeof(wDomain)); - } - return ptr; -} - static BOOL LsapIsLocalComputer(PLSA_UNICODE_STRING ServerName) { @@ -647,103 +594,37 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS WINAPI LsaQueryInformationPolicy(LSA_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, PVOID *Buffer) { + PLSAPR_POLICY_INFORMATION PolicyInformation = NULL; + NTSTATUS Status; + TRACE("(%p,0x%08x,%p)\n", PolicyHandle, InformationClass, Buffer); - if(!Buffer) return STATUS_INVALID_PARAMETER; - switch (InformationClass) - { - case PolicyAuditEventsInformation: /* 2 */ - { - PPOLICY_AUDIT_EVENTS_INFO p = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(POLICY_AUDIT_EVENTS_INFO)); - p->AuditingMode = FALSE; /* no auditing */ - *Buffer = p; - } - break; - case PolicyPrimaryDomainInformation: /* 3 */ - { - /* Only the domain name is valid for the local computer. - * All other fields are zero. - */ - PPOLICY_PRIMARY_DOMAIN_INFO pinfo; - - pinfo = ADVAPI_GetDomainName(sizeof(*pinfo), offsetof(POLICY_PRIMARY_DOMAIN_INFO, Name)); - - TRACE("setting domain to %s\n", debugstr_w(pinfo->Name.Buffer)); - - *Buffer = pinfo; - } - case PolicyAccountDomainInformation: /* 5 */ - { - struct di - { - POLICY_ACCOUNT_DOMAIN_INFO info; - SID sid; - DWORD padding[3]; - WCHAR domain[MAX_COMPUTERNAME_LENGTH + 1]; - }; - - DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1; - struct di * xdi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*xdi)); - - xdi->info.DomainName.MaximumLength = dwSize * sizeof(WCHAR); - xdi->info.DomainName.Buffer = xdi->domain; - if (GetComputerNameW(xdi->info.DomainName.Buffer, &dwSize)) - xdi->info.DomainName.Length = dwSize * sizeof(WCHAR); - - TRACE("setting name to %s\n", debugstr_w(xdi->info.DomainName.Buffer)); - - xdi->info.DomainSid = &xdi->sid; - - /* read the computer SID from the registry */ - if (!ADVAPI_GetComputerSid(&xdi->sid)) - { - HeapFree(GetProcessHeap(), 0, xdi); - - WARN("Computer SID not found\n"); - - return STATUS_UNSUCCESSFUL; - } - - *Buffer = xdi; - } - break; - case PolicyDnsDomainInformation: /* 12 (0xc) */ - { - /* Only the domain name is valid for the local computer. - * All other fields are zero. - */ - PPOLICY_DNS_DOMAIN_INFO pinfo; - - pinfo = ADVAPI_GetDomainName(sizeof(*pinfo), offsetof(POLICY_DNS_DOMAIN_INFO, Name)); - - TRACE("setting domain to %s\n", debugstr_w(pinfo->Name.Buffer)); - - *Buffer = pinfo; - } - break; - case PolicyAuditLogInformation: - case PolicyPdAccountInformation: - case PolicyLsaServerRoleInformation: - case PolicyReplicaSourceInformation: - case PolicyDefaultQuotaInformation: - case PolicyModificationInformation: - case PolicyAuditFullSetInformation: - case PolicyAuditFullQueryInformation: - case PolicyEfsInformation: - { - FIXME("category not implemented\n"); - return STATUS_UNSUCCESSFUL; - } - } - return STATUS_SUCCESS; + RpcTryExcept + { + Status = LsarQueryInformationPolicy((LSAPR_HANDLE)PolicyHandle, + InformationClass, + &PolicyInformation); + *Buffer = PolicyInformation; + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + if (PolicyInformation != NULL) + MIDL_user_free(PolicyInformation); + + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + TRACE("Done (Status: 0x%08x)\n", Status); + + return Status; } /* 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] Fri Oct 15 21:28:42 2010 @@ -60,9 +60,10 @@ } -static BOOL +static NTSTATUS LsapValidateDbHandle(LSAPR_HANDLE Handle, - LSA_DB_HANDLE_TYPE HandleType) + LSA_DB_HANDLE_TYPE HandleType, + ACCESS_MASK GrantedAccess) { PLSA_DB_HANDLE DbHandle = (PLSA_DB_HANDLE)Handle; BOOL bValid = FALSE; @@ -83,8 +84,15 @@ } _SEH2_END; - - return bValid; + if (bValid == FALSE) + return STATUS_INVALID_HANDLE; + + if (GrantedAccess != 0) + { + /* FIXME: Check for granted access rights */ + } + + return STATUS_SUCCESS; } @@ -145,13 +153,15 @@ // RtlEnterCriticalSection(&PolicyHandleTableLock); - if (LsapValidateDbHandle(*ObjectHandle, LsaDbIgnoreHandle)) + Status = LsapValidateDbHandle(*ObjectHandle, + LsaDbIgnoreHandle, + 0); + + if (Status == STATUS_SUCCESS) { RtlFreeHeap(RtlGetProcessHeap(), 0, *ObjectHandle); *ObjectHandle = NULL; } - else - Status = STATUS_INVALID_HANDLE; // RtlLeaveCriticalSection(&PolicyHandleTableLock); @@ -248,8 +258,148 @@ POLICY_INFORMATION_CLASS InformationClass, PLSAPR_POLICY_INFORMATION *PolicyInformation) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + TRACE("LsarQueryInformationPolicy(%p,0x%08x,%p)\n", + PolicyHandle, InformationClass, PolicyInformation); + + if (PolicyInformation) + { + TRACE("*PolicyInformation %p\n", *PolicyInformation); + } + + Status = LsapValidateDbHandle(PolicyHandle, + LsaDbPolicyHandle, + 0); /* FIXME */ + if (!NT_SUCCESS(Status)) + return Status; + + switch (InformationClass) + { + case PolicyAuditEventsInformation: /* 2 */ + { + PLSAPR_POLICY_AUDIT_EVENTS_INFO p = MIDL_user_allocate(sizeof(LSAPR_POLICY_AUDIT_EVENTS_INFO)); + if (p == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + p->AuditingMode = FALSE; /* no auditing */ + p->EventAuditingOptions = NULL; + p->MaximumAuditEventCount = 0; + + *PolicyInformation = (PLSAPR_POLICY_INFORMATION)p; + } + break; + + case PolicyPrimaryDomainInformation: /* 3 */ + { + PLSAPR_POLICY_PRIMARY_DOM_INFO p = MIDL_user_allocate(sizeof(LSAPR_POLICY_PRIMARY_DOM_INFO)); + if (p == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + p->Name.Length = 0; + p->Name.MaximumLength = 0; + p->Name.Buffer = NULL; +#if 0 + p->Name.Length = wcslen(L"COMPUTERNAME"); + p->Name.MaximumLength = p->Name.Length + sizeof(WCHAR); + p->Name.Buffer = MIDL_user_allocate(p->Name.MaximumLength); + if (p->Name.Buffer == NULL) + { + MIDL_user_free(p); + return STATUS_INSUFFICIENT_RESOURCES; + } + + wcscpy(p->Name.Buffer, L"COMPUTERNAME"); +#endif + + p->Sid = NULL; /* no domain, no workgroup */ + + *PolicyInformation = (PLSAPR_POLICY_INFORMATION)p; + } + break; + + case PolicyAccountDomainInformation: /* 5 */ + { + PLSAPR_POLICY_ACCOUNT_DOM_INFO p = MIDL_user_allocate(sizeof(LSAPR_POLICY_ACCOUNT_DOM_INFO)); + if (p == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + p->DomainName.Length = 0; + p->DomainName.MaximumLength = 0; + p->DomainName.Buffer = NULL; +#if 0 + p->DomainName.Length = wcslen(L"COMPUTERNAME"); + p->DomainName.MaximumLength = p->DomainName.Length + sizeof(WCHAR); + p->DomainName.Buffer = MIDL_user_allocate(p->DomainName.MaximumLength); + if (p->DomainName.Buffer == NULL) + { + MIDL_user_free(p); + return STATUS_INSUFFICIENT_RESOURCES; + } + + wcscpy(p->DomainName.Buffer, L"COMPUTERNAME"); +#endif + + p->Sid = NULL; /* no domain, no workgroup */ + + *PolicyInformation = (PLSAPR_POLICY_INFORMATION)p; + } + break; + + case PolicyDnsDomainInformation: /* 12 (0xc) */ + { + PLSAPR_POLICY_DNS_DOMAIN_INFO p = MIDL_user_allocate(sizeof(LSAPR_POLICY_DNS_DOMAIN_INFO)); + if (p == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + p->Name.Length = 0; + p->Name.MaximumLength = 0; + p->Name.Buffer = NULL; +#if 0 + p->Name.Length = wcslen(L"COMPUTERNAME"); + p->Name.MaximumLength = p->Name.Length + sizeof(WCHAR); + p->Name.Buffer = MIDL_user_allocate(p->Name.MaximumLength); + if (p->Name.Buffer == NULL) + { + MIDL_user_free(p); + return STATUS_INSUFFICIENT_RESOURCES; + } + + wcscpy(p->Name.Buffer, L"COMPUTERNAME"); +#endif + + p->DnsDomainName.Length = 0; + p->DnsDomainName.MaximumLength = 0; + p->DnsDomainName.Buffer = NULL; + + p->DnsForestName.Length = 0; + p->DnsForestName.MaximumLength = 0; + p->DnsForestName.Buffer = 0; + + memset(&p->DomainGuid, 0, sizeof(GUID)); + + p->Sid = NULL; /* no domain, no workgroup */ + + *PolicyInformation = (PLSAPR_POLICY_INFORMATION)p; + } + break; + + case PolicyAuditLogInformation: + case PolicyPdAccountInformation: + case PolicyLsaServerRoleInformation: + case PolicyReplicaSourceInformation: + case PolicyDefaultQuotaInformation: + case PolicyModificationInformation: + case PolicyAuditFullSetInformation: + case PolicyAuditFullQueryInformation: + case PolicyEfsInformation: + { + FIXME("category not implemented\n"); + return STATUS_UNSUCCESSFUL; + } + } + + return STATUS_SUCCESS; } @@ -688,10 +838,13 @@ TRACE("LsarLookupPrivilegeValue(%p, %wZ, %p)\n", PolicyHandle, Name, Value); - if (!LsapValidateDbHandle(PolicyHandle, LsaDbPolicyHandle)) - { - ERR("Invalid handle\n"); - return STATUS_INVALID_HANDLE; + Status = LsapValidateDbHandle(PolicyHandle, + LsaDbPolicyHandle, + 0); /* FIXME */ + if (!NT_SUCCESS(Status)) + { + ERR("Invalid handle (Status %lx)\n", Status); + return Status; } TRACE("Privilege: %wZ\n", Name); @@ -714,10 +867,13 @@ TRACE("LsarLookupPrivilegeName(%p, %p, %p)\n", PolicyHandle, Value, Name); - if (!LsapValidateDbHandle(PolicyHandle, LsaDbPolicyHandle)) + Status = LsapValidateDbHandle(PolicyHandle, + LsaDbPolicyHandle, + 0); /* FIXME */ + if (!NT_SUCCESS(Status)) { ERR("Invalid handle\n"); - return STATUS_INVALID_HANDLE; + return Status; } Status = LsarpLookupPrivilegeName(Value, (PUNICODE_STRING*)Name); @@ -766,10 +922,15 @@ PRPC_SID AccountSid, PLSAPR_USER_RIGHT_SET UserRights) { + NTSTATUS Status; + FIXME("(%p,%p,%p) stub\n", PolicyHandle, AccountSid, UserRights); - if (!LsapValidateDbHandle(PolicyHandle, LsaDbPolicyHandle)) - return STATUS_INVALID_HANDLE; + Status = LsapValidateDbHandle(PolicyHandle, + LsaDbPolicyHandle, + 0); /* FIXME */ + if (!NT_SUCCESS(Status)) + return Status; UserRights->Entries = 0; UserRights->UserRights = NULL;

1 0

[tkreuzer] 49160: [WIN32K] Renove some unneccessary casts
by tkreuzer＠svn.reactos.org 15 Oct '10

15 Oct '10

Author: tkreuzer Date: Fri Oct 15 20:13:10 2010 New Revision: 49160 URL: http://svn.reactos.org/svn/reactos?rev=49160&view=rev Log: [WIN32K] Renove some unneccessary casts Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Fri Oct 15 20:13:10 2010 @@ -109,10 +109,10 @@ ASSERT (dc->prgnVis != NULL); - retval = NtGdiCombineRgn(((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr, hrgn, 0, RGN_COPY); + retval = NtGdiCombineRgn(dc->prgnVis->BaseObject.hHmgr, hrgn, 0, RGN_COPY); if ( retval != ERROR ) { - NtGdiOffsetRgn(((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr, -dc->ptlDCOrig.x, -dc->ptlDCOrig.y); + NtGdiOffsetRgn(dc->prgnVis->BaseObject.hHmgr, -dc->ptlDCOrig.x, -dc->ptlDCOrig.y); CLIPPING_UpdateGCRegion(dc); } @@ -310,7 +310,7 @@ if (!dc->rosdc.hClipRgn) { dc->rosdc.hClipRgn = IntSysCreateRectRgn(0, 0, 0, 0); - NtGdiCombineRgn(dc->rosdc.hClipRgn, ((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr, NewRgn, RGN_DIFF); + NtGdiCombineRgn(dc->rosdc.hClipRgn, dc->prgnVis->BaseObject.hHmgr, NewRgn, RGN_DIFF); Result = SIMPLEREGION; } else @@ -551,7 +551,7 @@ CLIPOBJ * co; /* Must have VisRgn set to a valid state! */ - if (!pDC->prgnVis) return ERROR; + ASSERT (pDC->prgnVis); if (pDC->prgnAPI) {

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