Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 57171: [MINGWEX] - mark DllMain as a weak symbol for GCC. - supply a stubbed DllMain for MSVC. - DllMain is optional, and some DLLs don't implement it. That doesn't mean that they have no...
by jgardou＠svn.reactos.org 26 Aug '12

26 Aug '12

Author: jgardou Date: Sun Aug 26 23:31:49 2012 New Revision: 57171 URL: http://svn.reactos.org/svn/reactos?rev=57171&view=rev Log: [MINGWEX] - mark DllMain as a weak symbol for GCC. - supply a stubbed DllMain for MSVC. - DllMain is optional, and some DLLs don't implement it. That doesn't mean that they have no entry point, it means "I have nothing more to initialize than the CRT". Added: trunk/reactos/lib/sdk/crt/startup/mscdllmain.c (with props) Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/lib/sdk/crt/startup/crtdll.c Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sun Aug 26 23:31:49 2012 @@ -66,7 +66,9 @@ endif() if(MSVC) - list(APPEND MSVCRTEX_SOURCE startup/mscmain.c) + list(APPEND MSVCRTEX_SOURCE + startup/mscmain.c + startup/mscdllmain.c) else() list(APPEND MSVCRTEX_SOURCE startup/gccmain.c) endif() Modified: trunk/reactos/lib/sdk/crt/startup/crtdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crtdll… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/crtdll.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/crtdll.c [iso-8859-1] Sun Aug 26 23:31:49 2012 @@ -50,7 +50,19 @@ extern int mingw_app_type; +/* + * It is possible that a DLL provides no DllMain entry point. + * Mark it as a weak symbol for GCC. + * Tests show that at link time, MSVC looks for a function first in the object files provided, and then + * in the libraries. This means that we must provide a basic implementation in msvcrtex, which will be used + * if none is found in the object files provided to link.exe. + * This also means that we can't rely on a DllMain function implemented in a static library when linking a DLL. + */ +#ifdef __GNUC__ +extern WINBOOL WINAPI DllMain (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) __attribute__((weak)); +#else extern WINBOOL WINAPI DllMain (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved); +#endif extern WINBOOL WINAPI DllEntryPoint (HANDLE, DWORD, LPVOID); @@ -198,10 +210,12 @@ } if (dwReason == DLL_PROCESS_ATTACH) __main (); - retcode = DllMain(hDllHandle,dwReason,lpreserved); + if(DllMain) + retcode = DllMain(hDllHandle,dwReason,lpreserved); if (dwReason == DLL_PROCESS_ATTACH && ! retcode) { - DllMain (hDllHandle, DLL_PROCESS_DETACH, lpreserved); + if(DllMain) + DllMain (hDllHandle, DLL_PROCESS_DETACH, lpreserved); DllEntryPoint (hDllHandle, DLL_PROCESS_DETACH, lpreserved); _CRT_INIT (hDllHandle, DLL_PROCESS_DETACH, lpreserved); } Added: trunk/reactos/lib/sdk/crt/startup/mscdllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/mscdll… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/mscdllmain.c (added) +++ trunk/reactos/lib/sdk/crt/startup/mscdllmain.c [iso-8859-1] Sun Aug 26 23:31:49 2012 @@ -1,0 +1,11 @@ +#include <oscalls.h> +#define _DECL_DLLMAIN +#include <process.h> + +WINBOOL WINAPI DllMain (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) +{ + /* If the DLL provides no DllMain, then chances are that it doesn't bother with thread initialization */ + if(dwReason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls(hDllHandle); + return TRUE; +} Propchange: trunk/reactos/lib/sdk/crt/startup/mscdllmain.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 57170: [AFD] - Change AFD to a very aggressive buffering policy - It now attempts to keep its 64K receive buffer completely full at all times - This increases network performance signific...
by cgutman＠svn.reactos.org 26 Aug '12

26 Aug '12

Author: cgutman Date: Sun Aug 26 22:31:18 2012 New Revision: 57170 URL: http://svn.reactos.org/svn/reactos?rev=57170&view=rev Log: [AFD] - Change AFD to a very aggressive buffering policy - It now attempts to keep its 64K receive buffer completely full at all times - This increases network performance significantly Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun Aug 26 22:31:18 2012 @@ -6,52 +6,83 @@ * PROGRAMMER: Art Yerkes (ayerkes(a)speakeasy.net) * UPDATE HISTORY: * 20040708 Created - * - * Improve buffering code - * - * We're keeping data receiving in one of two states: - * A) Some data available in the FCB - * FCB->Recv.BytesUsed != FCB->Recv.Content - * FCB->ReceiveIrp.InFlightRequest == NULL - * AFD_EVENT_RECEIVE set in FCB->PollState - * B) No data available in the FCB - * FCB->Recv.BytesUsed == FCB->Recv.Content (== 0) - * FCB->RecieveIrp.InFlightRequest != NULL - * AFD_EVENT_RECEIVED not set in FCB->PollState - * So basically we either have data available or a TDI receive - * in flight. */ #include "afd.h" +static VOID RefillSocketBuffer( PAFD_FCB FCB ) +{ + /* Make sure nothing's in flight first */ + if (FCB->ReceiveIrp.InFlightRequest) return; + + /* Now ensure that receive is still allowed */ + if (FCB->TdiReceiveClosed) return; + + /* Check if the buffer is full */ + if (FCB->Recv.Content == FCB->Recv.Size) + { + /* If there are bytes used, we can solve this problem */ + if (FCB->Recv.BytesUsed != 0) + { + /* Reposition the unused portion to the beginning of the receive window */ + RtlMoveMemory(FCB->Recv.Window, + FCB->Recv.Window + FCB->Recv.BytesUsed, + FCB->Recv.Content - FCB->Recv.BytesUsed); + + FCB->Recv.Content -= FCB->Recv.BytesUsed; + FCB->Recv.BytesUsed = 0; + } + else + { + /* No space in the buffer to receive */ + return; + } + } + + AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n")); + + TdiReceive( &FCB->ReceiveIrp.InFlightRequest, + FCB->Connection.Object, + TDI_RECEIVE_NORMAL, + FCB->Recv.Window + FCB->Recv.Content, + FCB->Recv.Size - FCB->Recv.Content, + &FCB->ReceiveIrp.Iosb, + ReceiveComplete, + FCB ); +} + static VOID HandleReceiveComplete( PAFD_FCB FCB, NTSTATUS Status, ULONG_PTR Information ) { - FCB->Recv.BytesUsed = 0; - /* We got closed while the receive was in progress */ if (FCB->TdiReceiveClosed) { FCB->Recv.Content = 0; - } - /* Receive successful with new data */ - else if (Status == STATUS_SUCCESS && Information) - { - FCB->Recv.Content = Information; - } - /* Receive successful with no data (graceful closure) */ + FCB->Recv.BytesUsed = 0; + } + /* Receive successful */ else if (Status == STATUS_SUCCESS) { - FCB->Recv.Content = 0; - FCB->TdiReceiveClosed = TRUE; - - /* Signal graceful receive shutdown */ - FCB->PollState |= AFD_EVENT_DISCONNECT; - FCB->PollStatus[FD_CLOSE_BIT] = Status; - - PollReeval( FCB->DeviceExt, FCB->FileObject ); + FCB->Recv.Content += Information; + ASSERT(FCB->Recv.Content <= FCB->Recv.Size); + + /* Check for graceful closure */ + if (Information == 0) + { + FCB->TdiReceiveClosed = TRUE; + + /* Signal graceful receive shutdown */ + FCB->PollState |= AFD_EVENT_DISCONNECT; + FCB->PollStatus[FD_CLOSE_BIT] = Status; + + PollReeval( FCB->DeviceExt, FCB->FileObject ); + } + + /* Issue another receive IRP to keep the buffer well stocked */ + RefillSocketBuffer(FCB); } /* Receive failed with no data (unexpected closure) */ else { + FCB->Recv.BytesUsed = 0; FCB->Recv.Content = 0; FCB->TdiReceiveClosed = TRUE; @@ -67,22 +98,6 @@ UINT BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; return !BytesAvailable && FCB->TdiReceiveClosed; -} - -static VOID RefillSocketBuffer( PAFD_FCB FCB ) { - if( !FCB->ReceiveIrp.InFlightRequest && - !FCB->TdiReceiveClosed ) { - AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n")); - - TdiReceive( &FCB->ReceiveIrp.InFlightRequest, - FCB->Connection.Object, - TDI_RECEIVE_NORMAL, - FCB->Recv.Window, - FCB->Recv.Size, - &FCB->ReceiveIrp.Iosb, - ReceiveComplete, - FCB ); - } } static NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB, @@ -137,13 +152,8 @@ } } - /* If there's nothing left in our buffer start a new request */ - if( FCB->Recv.BytesUsed == FCB->Recv.Content ) { - FCB->Recv.BytesUsed = FCB->Recv.Content = 0; - FCB->PollState &= ~AFD_EVENT_RECEIVE; - - RefillSocketBuffer( FCB ); - } + /* Issue another receive IRP to keep the buffer well stocked */ + RefillSocketBuffer(FCB); return STATUS_SUCCESS; }

1 0

[cgutman] 57169: [LWIP] - Fix broken handling of partial receives
by cgutman＠svn.reactos.org 26 Aug '12

26 Aug '12

Author: cgutman Date: Sun Aug 26 22:24:49 2012 New Revision: 57169 URL: http://svn.reactos.org/svn/reactos?rev=57169&view=rev Log: [LWIP] - Fix broken handling of partial receives Modified: trunk/reactos/lib/drivers/lwip/src/include/rosip.h trunk/reactos/lib/drivers/lwip/src/rostcp.c Modified: trunk/reactos/lib/drivers/lwip/src/include/rosip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] Sun Aug 26 22:24:49 2012 @@ -15,6 +15,7 @@ typedef struct _QUEUE_ENTRY { struct pbuf *p; + ULONG Offset; LIST_ENTRY ListEntry; } QUEUE_ENTRY, *PQUEUE_ENTRY; Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rostc… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Sun Aug 26 22:24:49 2012 @@ -60,6 +60,7 @@ qp = (PQUEUE_ENTRY)ExAllocateFromNPagedLookasideList(&QueueEntryLookasideList); qp->p = p; + qp->Offset = 0; ExInterlockedInsertTailList(&Connection->PacketQueue, &qp->ListEntry, &Connection->Lock); } @@ -82,9 +83,10 @@ { PQUEUE_ENTRY qp; struct pbuf* p; - NTSTATUS Status = STATUS_PENDING; - UINT ReadLength, ExistingDataLength; + NTSTATUS Status; + UINT ReadLength, PayloadLength; KIRQL OldIrql; + PUCHAR Payload; (*Received) = 0; @@ -95,49 +97,53 @@ while ((qp = LibTCPDequeuePacket(Connection)) != NULL) { p = qp->p; - ExistingDataLength = (*Received); + + /* Calculate the payload first */ + Payload = p->payload; + Payload += qp->Offset; + PayloadLength = p->len; + PayloadLength -= qp->Offset; + + /* Check if we're reading the whole buffer */ + ReadLength = MIN(PayloadLength, RecvLen); + if (ReadLength != PayloadLength) + { + /* Save this one for later */ + qp->Offset += ReadLength; + InsertHeadList(&Connection->PacketQueue, &qp->ListEntry); + qp = NULL; + } + + UnlockObject(Connection, OldIrql); + + /* Return to a lower IRQL because the receive buffer may be pageable memory */ + RtlCopyMemory(RecvBuffer, + Payload, + ReadLength); + + LockObject(Connection, &OldIrql); + + /* Update trackers */ + RecvLen -= ReadLength; + RecvBuffer += ReadLength; + (*Received) += ReadLength; + + if (qp != NULL) + { + /* Use this special pbuf free callback function because we're outside tcpip thread */ + pbuf_free_callback(qp->p); + + ExFreeToNPagedLookasideList(&QueueEntryLookasideList, qp); + } + else + { + /* If we get here, it means we've filled the buffer */ + ASSERT(RecvLen == 0); + } Status = STATUS_SUCCESS; - ReadLength = MIN(p->tot_len, RecvLen); - if (ReadLength != p->tot_len) - { - if (ExistingDataLength) - { - /* The packet was too big but we used some data already so give it another shot later */ - InsertHeadList(&Connection->PacketQueue, &qp->ListEntry); - break; - } - else - { - /* The packet is just too big to fit fully in our buffer, even when empty so - * return an informative status but still copy all the data we can fit. - */ - Status = STATUS_BUFFER_OVERFLOW; - } - } - - UnlockObject(Connection, OldIrql); - - /* Return to a lower IRQL because the receive buffer may be pageable memory */ - for (; (*Received) < ReadLength + ExistingDataLength; (*Received) += p->len, p = p->next) - { - RtlCopyMemory(RecvBuffer + (*Received), p->payload, p->len); - } - - LockObject(Connection, &OldIrql); - - RecvLen -= ReadLength; - - /* Use this special pbuf free callback function because we're outside tcpip thread */ - pbuf_free_callback(qp->p); - - ExFreeToNPagedLookasideList(&QueueEntryLookasideList, qp); - if (!RecvLen) - break; - - if (Status != STATUS_SUCCESS) break; } } @@ -196,6 +202,8 @@ InternalRecvEventHandler(void *arg, PTCP_PCB pcb, struct pbuf *p, const err_t err) { PCONNECTION_ENDPOINT Connection = arg; + struct pbuf *pb; + ULONG RecvLen; /* Make sure the socket didn't get closed */ if (!arg) @@ -208,9 +216,19 @@ if (p) { - LibTCPEnqueuePacket(Connection, p); - - tcp_recved(pcb, p->tot_len); + pb = p; + RecvLen = 0; + while (pb != NULL) + { + /* Enqueue this buffer */ + LibTCPEnqueuePacket(Connection, pb); + RecvLen += pb->len; + + /* Advance and unchain the buffer */ + pb = pbuf_dechain(pb);; + } + + tcp_recved(pcb, RecvLen); TCPRecvEventHandler(arg); }

1 0

[cgutman] 57168: [AFD] - Fix returning uninitialized data from FIONREAD when the socket is not bound or connected
by cgutman＠svn.reactos.org 26 Aug '12

26 Aug '12

Author: cgutman Date: Sun Aug 26 20:13:22 2012 New Revision: 57168 URL: http://svn.reactos.org/svn/reactos?rev=57168&view=rev Log: [AFD] - Fix returning uninitialized data from FIONREAD when the socket is not bound or connected Modified: trunk/reactos/drivers/network/afd/afd/info.c Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sun Aug 26 20:13:22 2012 @@ -52,11 +52,7 @@ break; case AFD_INFO_RECEIVE_CONTENT_SIZE: - /* Only touch InfoReq if a socket has been set up. - Behaviour was verified under WinXP SP2. */ - if(FCB->AddressFile.Object || FCB->Connection.Object) - InfoReq->Information.Ulong = FCB->Recv.Content - FCB->Recv.BytesUsed; - + InfoReq->Information.Ulong = FCB->Recv.Content - FCB->Recv.BytesUsed; break; case AFD_INFO_SENDS_IN_PROGRESS:

1 0

[ekohl] 57167: [ADVAPI32/LSASRV] - Implement LsaSetSeceret/LsarSetSecret (secret values are not encrypted yet) and LsaSetSystemAccessAccount. - Improve some TRACE messages.
by ekohl＠svn.reactos.org 26 Aug '12

26 Aug '12

Author: ekohl Date: Sun Aug 26 14:05:27 2012 New Revision: 57167 URL: http://svn.reactos.org/svn/reactos?rev=57167&view=rev Log: [ADVAPI32/LSASRV] - Implement LsaSetSeceret/LsarSetSecret (secret values are not encrypted yet) and LsaSetSystemAccessAccount. - Improve some TRACE messages. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/include/psdk/ntlsa.h trunk/reactos/include/psdk/ntsecapi.h trunk/reactos/include/reactos/idl/lsa.idl 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] Sun Aug 26 14:05:27 2012 @@ -402,7 +402,7 @@ @ stub LsaSetQuotasForAccount @ stdcall LsaSetSecret(ptr ptr ptr) @ stub LsaSetSecurityObject -@ stub LsaSetSystemAccessAccount +@ stdcall LsaSetSystemAccessAccount(ptr long) @ stdcall LsaSetTrustedDomainInfoByName(ptr ptr long ptr) @ stdcall LsaSetTrustedDomainInformation(ptr ptr long ptr) @ stdcall LsaStorePrivateData(ptr ptr ptr) 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] Sun Aug 26 14:05:27 2012 @@ -1027,7 +1027,8 @@ { LSAPR_USER_RIGHT_SET UserRightSet; - TRACE("(%p,%p,%d,%p,0x%08x) stub\n", PolicyHandle, AccountSid, AllRights, UserRights, CountOfRights); + TRACE("LsaRemoveAccountRights(%p %p %d %p 0x%08x) stub\n", + PolicyHandle, AccountSid, AllRights, UserRights, CountOfRights); UserRightSet.Entries = CountOfRights; UserRightSet.UserRights = (PRPC_UNICODE_STRING)UserRights; @@ -1089,7 +1090,8 @@ { NTSTATUS Status; - TRACE("(%p,0x%08x,%p)\n", PolicyHandle, InformationClass, Buffer); + TRACE("LsaSetInformationPolicy(%p 0x%08x %p)\n", + PolicyHandle, InformationClass, Buffer); RpcTryExcept { @@ -1108,17 +1110,106 @@ /* - * @unimplemented - */ -NTSTATUS WINAPI LsaSetSecret( - IN LSA_HANDLE SecretHandle, - IN PLSA_UNICODE_STRING EncryptedCurrentValue, - IN PLSA_UNICODE_STRING EncryptedOldValue) -{ - FIXME("(%p,%p,%p) stub\n", SecretHandle, EncryptedCurrentValue, - EncryptedOldValue); - return STATUS_SUCCESS; -} + * @implemented + */ +NTSTATUS +WINAPI +LsaSetSecret(IN LSA_HANDLE SecretHandle, + IN PLSA_UNICODE_STRING CurrentValue OPTIONAL, + IN PLSA_UNICODE_STRING OldValue OPTIONAL) +{ + PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue = NULL; + PLSAPR_CR_CIPHER_VALUE EncryptedOldValue = NULL; + SIZE_T BufferSize; + NTSTATUS Status; + + TRACE("LsaSetSecret(%p,%p,%p)\n", + SecretHandle, EncryptedCurrentValue, EncryptedOldValue); + + if (CurrentValue != NULL) + { + BufferSize = sizeof(LSAPR_CR_CIPHER_VALUE) + CurrentValue->MaximumLength; + EncryptedCurrentValue = midl_user_allocate(BufferSize); + if (EncryptedCurrentValue == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + EncryptedCurrentValue->Length = CurrentValue->Length; + EncryptedCurrentValue->MaximumLength = CurrentValue->MaximumLength; + EncryptedCurrentValue->Buffer = (BYTE *)(EncryptedCurrentValue + 1); + if (EncryptedCurrentValue->Buffer != NULL) + memcpy(EncryptedCurrentValue->Buffer, CurrentValue->Buffer, CurrentValue->Length); + } + + if (OldValue != NULL) + { + BufferSize = sizeof(LSAPR_CR_CIPHER_VALUE) + OldValue->MaximumLength; + EncryptedOldValue = midl_user_allocate(BufferSize); + if (EncryptedOldValue == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + EncryptedOldValue->Length = OldValue->Length; + EncryptedOldValue->MaximumLength = OldValue->MaximumLength; + EncryptedOldValue->Buffer = (BYTE*)(EncryptedOldValue + 1); + if (EncryptedOldValue->Buffer != NULL) + memcpy(EncryptedOldValue->Buffer, OldValue->Buffer, OldValue->Length); + } + + RpcTryExcept + { + Status = LsarSetSecret((LSAPR_HANDLE)SecretHandle, + EncryptedCurrentValue, + EncryptedOldValue); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + +done: + if (EncryptedCurrentValue != NULL) + midl_user_free(EncryptedCurrentValue); + + if (EncryptedOldValue != NULL) + midl_user_free(EncryptedOldValue); + + return Status; +} + + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaSetSystemAccessAccount(IN LSA_HANDLE AccountHandle, + IN ULONG SystemAccess) +{ + NTSTATUS Status; + + TRACE("LsaSetSystemAccessAccount(%p 0x%lx)\n", + AccountHandle, SystemAccess); + + RpcTryExcept + { + Status = LsarSetSystemAccessAccount((LSAPR_HANDLE)AccountHandle, + SystemAccess); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + /* * @unimplemented 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] Sun Aug 26 14:05:27 2012 @@ -1193,12 +1193,96 @@ /* Function 29 */ NTSTATUS WINAPI LsarSetSecret( - LSAPR_HANDLE *SecretHandle, + LSAPR_HANDLE SecretHandle, PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue, PLSAPR_CR_CIPHER_VALUE EncryptedOldValue) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT SecretObject; + PBYTE CurrentValue = NULL; + PBYTE OldValue = NULL; + ULONG CurrentValueLength = 0; + ULONG OldValueLength = 0; + LARGE_INTEGER Time; + NTSTATUS Status; + + /* Validate the SecretHandle */ + Status = LsapValidateDbObject(SecretHandle, + LsaDbSecretObject, + SECRET_SET_VALUE, + &SecretObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapValidateDbObject returned 0x%08lx\n", Status); + return Status; + } + + if (EncryptedCurrentValue != NULL) + { + /* FIXME: Decrypt the current value */ + CurrentValue = EncryptedCurrentValue->Buffer; + CurrentValueLength = EncryptedCurrentValue->MaximumLength; + } + + /* Set the current value */ + Status = LsapSetObjectAttribute(SecretObject, + L"CurrentValue", + CurrentValue, + CurrentValueLength); + if (!NT_SUCCESS(Status)) + { + ERR("LsapSetObjectAttribute failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Get the current time */ + Status = NtQuerySystemTime(&Time); + if (!NT_SUCCESS(Status)) + { + ERR("NtQuerySystemTime failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Set the current time */ + Status = LsapSetObjectAttribute(SecretObject, + L"CurrentTime", + &Time, + sizeof(LARGE_INTEGER)); + if (!NT_SUCCESS(Status)) + { + ERR("LsapSetObjectAttribute failed (Status 0x%08lx)\n", Status); + goto done; + } + + if (EncryptedOldValue != NULL) + { + /* FIXME: Decrypt the old value */ + OldValue = EncryptedOldValue->Buffer; + OldValueLength = EncryptedOldValue->MaximumLength; + } + + /* Set the old value */ + Status = LsapSetObjectAttribute(SecretObject, + L"OldValue", + OldValue, + OldValueLength); + if (!NT_SUCCESS(Status)) + { + ERR("LsapSetObjectAttribute failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Set the old time */ + Status = LsapSetObjectAttribute(SecretObject, + L"OldTime", + &Time, + sizeof(LARGE_INTEGER)); + if (!NT_SUCCESS(Status)) + { + ERR("LsapSetObjectAttribute failed (Status 0x%08lx)\n", Status); + } + +done: + return Status; } Modified: trunk/reactos/include/psdk/ntlsa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntlsa.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ntlsa.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntlsa.h [iso-8859-1] Sun Aug 26 14:05:27 2012 @@ -30,6 +30,8 @@ #define ACCOUNT_ADJUST_QUOTAS 4 #define ACCOUNT_ADJUST_SYSTEM_ACCESS 8 +#define SECRET_SET_VALUE 1 +#define SECRET_QUERY_VALUE 2 #ifdef __cplusplus 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] Sun Aug 26 14:05:27 2012 @@ -735,6 +735,7 @@ NTSTATUS NTAPI LsaSetInformationPolicy(LSA_HANDLE,POLICY_INFORMATION_CLASS, PVOID); NTSTATUS NTAPI LsaSetLocalInformationPolicy(LSA_HANDLE, POLICY_LOCAL_INFORMATION_CLASS,PVOID); +NTSTATUS NTAPI LsaSetSecret(LSA_HANDLE, PLSA_UNICODE_STRING, PLSA_UNICODE_STRING); NTSTATUS NTAPI LsaSetSystemAccessAccount(LSA_HANDLE, ULONG); NTSTATUS NTAPI LsaSetTrustedDomainInformation(LSA_HANDLE,PSID, TRUSTED_INFORMATION_CLASS,PVOID); 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] Sun Aug 26 14:05:27 2012 @@ -775,7 +775,7 @@ /* Function 29 */ NTSTATUS __stdcall LsarSetSecret( - [in] LSAPR_HANDLE *SecretHandle, + [in] LSAPR_HANDLE SecretHandle, [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue, [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedOldValue);

1 0

[tfaber] 57166: [KMTESTS:EX] - Make hard-coded calling convention exceptions in ExInterlocked compatible with GCC 4.7, and add the corresponding TODO about how ugly this is
by tfaber＠svn.reactos.org 26 Aug '12

26 Aug '12

Author: tfaber Date: Sun Aug 26 12:06:45 2012 New Revision: 57166 URL: http://svn.reactos.org/svn/reactos?rev=57166&view=rev Log: [KMTESTS:EX] - Make hard-coded calling convention exceptions in ExInterlocked compatible with GCC 4.7, and add the corresponding TODO about how ugly this is Modified: trunk/rostests/kmtests/ntos_ex/ExInterlocked.c Modified: trunk/rostests/kmtests/ntos_ex/ExInterlocked.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExInterlo… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1] Sun Aug 26 12:06:45 2012 @@ -50,6 +50,8 @@ typedef int PROCESSOR_STATE; #endif +/* TODO: these need to be rewritten in proper assembly to account for registers + * saved by the caller */ #if defined(_MSC_VER) && defined(_M_IX86) #define SaveState(State) do \ { \ @@ -74,19 +76,20 @@ #elif defined(__GNUC__) && defined(_M_IX86) #define SaveState(State) \ asm volatile( \ - "movl\t%%esi, (%%ecx)\n\t" \ - "movl\t%%edi, 4(%%ecx)\n\t" \ - "movl\t%%ebx, 8(%%ecx)\n\t" \ - "movl\t%%ebp, 12(%%ecx)\n\t" \ - "movl\t%%esp, 16(%%ecx)" \ + "movl\t%%esi, (%%ecx)\n\t" \ + "movl\t%%edi, 4(%%ecx)\n\t" \ + "movl\t%%ebx, 8(%%ecx)\n\t" \ + "movl\t%%ebp, 12(%%ecx)\n\t" \ + "movl\t%%esp, 16(%%ecx)" \ : : "c" (&State) : "memory" \ ); #define CheckState(OldState, NewState) do \ { \ - ok_eq_hex((OldState)->esi, (NewState)->esi); \ + /* TODO: GCC 4.7 uses esi and saves it before, so this is okay */ \ + /*ok_eq_hex((OldState)->esi, (NewState)->esi);*/ \ ok_eq_hex((OldState)->edi, (NewState)->edi); \ - /* TODO: GCC uses ebx and saves it before, so this is okay */ \ + /* TODO: GCC 4.4 uses ebx and saves it before, so this is okay */ \ /*ok_eq_hex((OldState)->ebx, (NewState)->ebx);*/ \ ok_eq_hex((OldState)->ebp, (NewState)->ebp); \ ok_eq_hex((OldState)->esp, (NewState)->esp); \ @@ -94,15 +97,15 @@ #elif defined(__GNUC__) && defined(_M_AMD64) #define SaveState(State) \ asm volatile( \ - "mov\t%%rsi, (%%rcx)\n\t" \ - "mov\t%%rdi, 8(%%rcx)\n\t" \ - "mov\t%%rbx, 16(%%rcx)\n\t" \ - "mov\t%%rbp, 24(%%rcx)\n\t" \ - "mov\t%%rsp, 32(%%rcx)\n\t" \ - "mov\t%%r12, 40(%%rcx)\n\t" \ - "mov\t%%r13, 48(%%rcx)\n\t" \ - "mov\t%%r14, 56(%%rcx)\n\t" \ - "mov\t%%r15, 64(%%rcx)" \ + "mov\t%%rsi, (%%rcx)\n\t" \ + "mov\t%%rdi, 8(%%rcx)\n\t" \ + "mov\t%%rbx, 16(%%rcx)\n\t" \ + "mov\t%%rbp, 24(%%rcx)\n\t" \ + "mov\t%%rsp, 32(%%rcx)\n\t" \ + "mov\t%%r12, 40(%%rcx)\n\t" \ + "mov\t%%r13, 48(%%rcx)\n\t" \ + "mov\t%%r14, 56(%%rcx)\n\t" \ + "mov\t%%r15, 64(%%rcx)" \ : : "c" (&State) : "memory" \ );

1 0

[tfaber] 57165: [GDI32_APITEST] - Fix build
by tfaber＠svn.reactos.org 26 Aug '12

26 Aug '12

Author: tfaber Date: Sun Aug 26 11:35:58 2012 New Revision: 57165 URL: http://svn.reactos.org/svn/reactos?rev=57165&view=rev Log: [GDI32_APITEST] - Fix build Modified: trunk/rostests/apitests/gdi32/CreateIconIndirect.c Modified: trunk/rostests/apitests/gdi32/CreateIconIndirect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateIcon… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateIconIndirect.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateIconIndirect.c [iso-8859-1] Sun Aug 26 11:35:58 2012 @@ -135,7 +135,7 @@ } -START_TEST(GetIconInfo) +START_TEST(CreateIconIndirect) { HCURSOR hcursor; HICON hicon;

1 0

[tfaber] 57164: [GDI32_APITEST] - Actually run the CreateIconIndirect test when it's called
by tfaber＠svn.reactos.org 26 Aug '12

26 Aug '12

Author: tfaber Date: Sun Aug 26 11:17:37 2012 New Revision: 57164 URL: http://svn.reactos.org/svn/reactos?rev=57164&view=rev Log: [GDI32_APITEST] - Actually run the CreateIconIndirect test when it's called Modified: trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Sun Aug 26 11:17:37 2012 @@ -75,7 +75,7 @@ { "CreateDIBPatternBrush", func_CreateDIBPatternBrush }, { "CreateFont", func_CreateFont }, { "CreateFontIndirect", func_CreateFontIndirect }, - { "CreateIconIndirect", func_CreateFontIndirect }, + { "CreateIconIndirect", func_CreateIconIndirect }, { "CreatePen", func_CreatePen }, { "CreateRectRgn", func_CreateRectRgn }, { "DPtoLP", func_DPtoLP },

1 0

[akhaldi] 57163: [CMAKE] * Escape the source folder here.
by akhaldi＠svn.reactos.org 26 Aug '12

26 Aug '12

Author: akhaldi Date: Sun Aug 26 11:14:52 2012 New Revision: 57163 URL: http://svn.reactos.org/svn/reactos?rev=57163&view=rev Log: [CMAKE] * Escape the source folder here. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=57163&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Aug 26 11:14:52 2012 @@ -19,7 +19,7 @@ if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) string(REPLACE "/" "\\" REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR}) endif() -add_compile_flags("-fdebug-prefix-map=${REACTOS_SOURCE_DIR_NATIVE}=ReactOS") +add_compile_flags("-fdebug-prefix-map=\"${REACTOS_SOURCE_DIR_NATIVE}\"=ReactOS") # Debugging if(SEPARATE_DBG)

1 0

[fireball] 57162: [SYSCALLS] - Remove old unnecessary copy of syscalls.inc
by fireball＠svn.reactos.org 26 Aug '12

26 Aug '12

Author: fireball Date: Sun Aug 26 10:22:39 2012 New Revision: 57162 URL: http://svn.reactos.org/svn/reactos?rev=57162&view=rev Log: [SYSCALLS] - Remove old unnecessary copy of syscalls.inc Removed: trunk/reactos/include/reactos/syscalls.inc Removed: trunk/reactos/include/reactos/syscalls.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/syscalls.i… ============================================================================== --- trunk/reactos/include/reactos/syscalls.inc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/syscalls.inc (removed) @@ -1,94 +1,0 @@ - -#ifdef _M_IX86 -#define KUSER_SHARED_SYSCALL HEX(7ffe0300) -#define KGDT_R0_CODE 8 -MACRO(STUBCODE_U, SyscallId, StackBytes) - mov eax, SyscallId - mov ecx, KUSER_SHARED_SYSCALL - call dword ptr [ecx] - ret StackBytes -ENDM -MACRO(STUBCODE_K, SyscallId, StackBytes) - mov eax, SyscallId - lea edx, [esp + 4] - pushf - push KGDT_R0_CODE - call _KiSystemService - ret StackBytes -ENDM -#elif defined(_M_AMD64) -MACRO(STUBCODE_U, SyscallId, StackBytes) - mov eax, SyscallId - mov r10, rcx - syscall - ret StackBytes -ENDM -MACRO(STUBCODE_K, SyscallId, StackBytes) - mov eax, SyscallId - call KiSystemService - ret StackBytes -ENDM -#elif defined(_M_ARM) -MACRO(STUBCODE_U, SyscallId, StackBytes) - swi #SyscallId - bx lr -ENDM -MACRO(STUBCODE_K, SyscallId, StackBytes) - mov ip, lr - swi #SyscallId - bx ip -ENDM -#elif defined(_M_PPC) -MACRO(STUBCODE_U, SyscallId, StackBytes) - stwu 1,-16(1) - mflr 0 - stw 0,0(1) - li 0, SyscallId - sc - lwz 0,0(1) - mtlr 0 - addi 1,1,16 - blr -ENDM -#define STUBCODE_K STUBCODE_U -#elif defined(_M_MIPS) -MACRO(STUBCODE_U, SyscallId, StackBytes) - li $8, KUSER_SHARED_SYSCALL - lw $8,0($8) - j $8 - nop -ENDM -MACRO(STUBCODE_K, SyscallId, StackBytes) - j KiSystemService - nop -ENDM -#else -#error unsupported architecture -#endif - -#ifdef _M_IX86 -MACRO(MAKE_LABEL, Name, Stackbytes) - PUBLIC _&Name&@&Stackbytes - _&Name&@&Stackbytes: -ENDM -#else -MACRO(MAKE_LABEL, Name, Stackbytes) - PUBLIC &Name - &Name: -ENDM -#endif - -MACRO(STUB_U, Name, ArgCount) - Stackbytes = 4 * &ArgCount - MAKE_LABEL Zw&Name, %Stackbytes - MAKE_LABEL Nt&Name, %Stackbytes - STUBCODE_U SyscallId, %Stackbytes - SyscallId = SyscallId + 1 -ENDM - -MACRO(STUB_K, Name, ArgCount) - Stackbytes = 4 * &ArgCount - MAKE_LABEL Zw&Name, %Stackbytes - STUBCODE_K SyscallId, %Stackbytes - SyscallId = SyscallId + 1 -ENDM

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