Ros-diffs

ros-diffs@reactos.org

81390 discussions

[rharabien] 52015: [NTOSKRNL] - Declare function without arguments with VOID keyword - Improve rbuild file
by rharabien＠svn.reactos.org 30 May '11

30 May '11

Author: rharabien Date: Mon May 30 21:26:33 2011 New Revision: 52015 URL: http://svn.reactos.org/svn/reactos?rev=52015&view=rev Log: [NTOSKRNL] - Declare function without arguments with VOID keyword - Improve rbuild file Modified: trunk/reactos/ntoskrnl/cache/newcc.h trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/cache/newcc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/newcc.h?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cache/newcc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/newcc.h [iso-8859-1] Mon May 30 21:26:33 2011 @@ -75,7 +75,7 @@ VOID NTAPI -CcShutdownSystem(); +CcShutdownSystem(VOID); VOID NTAPI Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild [iso-8859-1] Mon May 30 21:26:33 2011 @@ -4,8 +4,8 @@ <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe"> <xi:include href="ntoskrnl-generic.rbuild" /> </module> + <module name="ntdllsys" type="staticlibrary"> + <include base="ntoskrnl">include</include> + <file>ntdll.S</file> + </module> </group> -<module name="ntdllsys" type="staticlibrary"> - <include base="ntoskrnl">include</include> - <file>ntdll.S</file> -</module>

1 0

[sserapion] 52014: [NTLMSSP] - Implement NtlmHandleNegotiateMessage NtlmHandleChallengeMessage and NtlmHandleAuthenticateMessage - all wine client server tests pass - still missing a lot of stuff (...
by sserapion＠svn.reactos.org 30 May '11

30 May '11

Author: sserapion Date: Mon May 30 21:02:50 2011 New Revision: 52014 URL: http://svn.reactos.org/svn/reactos?rev=52014&view=rev Log: [NTLMSSP] - Implement NtlmHandleNegotiateMessage NtlmHandleChallengeMessage and NtlmHandleAuthenticateMessage - all wine client server tests pass - still missing a lot of stuff (WIP code) Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/context.c branches/sspi-bringup/reactos/dll/win32/ntlmssp/credentials.c branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlmssp.h branches/sspi-bringup/reactos/dll/win32/ntlmssp/protocol.c branches/sspi-bringup/reactos/dll/win32/ntlmssp/protocol.h Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/context.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/context.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/context.c [iso-8859-1] Mon May 30 21:02:50 2011 @@ -391,13 +391,7 @@ ret = NtlmGenerateNegotiateMessage(newContext, fContextReq, InputToken1, - &OutputToken1); - - if(!NT_SUCCESS(ret)) - { - ERR("NtlmGenerateNegotiateMessage failed with %lx\n", ret); - goto fail; - } + OutputToken1); /* set result */ phNewContext->dwUpper = NegotiateFlags; @@ -406,7 +400,6 @@ else /* challenge! */ { TRACE("ISC challenged!\n"); - *phNewContext = *phContext; if (fContextReq & ISC_REQ_USE_SUPPLIED_CREDS) { /* get second input token */ @@ -421,6 +414,7 @@ } } + *phNewContext = *phContext; ret = NtlmHandleChallengeMessage(phNewContext->dwLower, fContextReq, InputToken1, @@ -430,13 +424,12 @@ pfContextAttr, ptsExpiry, &NegotiateFlags); - - if(!NT_SUCCESS(ret)) - { - ERR("NtlmHandleChallengeMessage failed with %lx\n", ret); - goto fail; - } - + } + + if(!NT_SUCCESS(ret)) + { + ERR("failed with %lx\n", ret); + goto fail; } /* build blob with the output message */ @@ -575,7 +568,7 @@ { SECURITY_STATUS ret = SEC_E_OK; PSecBuffer InputToken1, InputToken2; - PSecBuffer OutputToken1; + PSecBuffer OutputToken1, OutputToken2; TRACE("AcceptSecurityContext %p %p %p %lx %lx %p %p %p %p\n", phCredential, phContext, pInput, fContextReq, TargetDataRep, phNewContext, pOutput, pfContextAttr, ptsExpiry); @@ -614,29 +607,56 @@ } /* first call */ - if(!phContext && !InputToken2) + if(!phContext)// && !InputToken2) { if(!phCredential) { ret = SEC_E_INVALID_HANDLE; goto fail; } - + TRACE("phNewContext->dwLower %lx\n", phNewContext->dwLower); ret = NtlmHandleNegotiateMessage(phCredential->dwLower, - &phNewContext->dwLower, + phNewContext->dwLower, fContextReq, InputToken1, - &OutputToken1, + InputToken2, + OutputToken1, + OutputToken2, pfContextAttr, ptsExpiry); } else { - WARN("Handle Authenticate UNIMPLEMENTED!\n"); - } - //if(!NT_SUCCESS(ret)) - - UNIMPLEMENTED; + *phNewContext = *phContext; + USER_SESSION_KEY sessionKey; + ULONG userflags; + TRACE("phNewContext->dwLower %lx\n", phNewContext->dwLower); + ret = NtlmHandleAuthenticateMessage(phNewContext->dwLower, + fContextReq, + InputToken1, + OutputToken1, + pfContextAttr, + ptsExpiry, + (PUCHAR)&sessionKey, + &userflags); + } + + if(!NT_SUCCESS(ret)) + { + ERR("failed with %lx\n", ret); + goto fail; + } + + /* build blob with the output message */ + SecBufferDesc BufferDesc; + BufferDesc.ulVersion = SECBUFFER_VERSION; + BufferDesc.cBuffers = 1; + BufferDesc.pBuffers = OutputToken1; + + if(fContextReq & ASC_REQ_ALLOCATE_MEMORY) + *pfContextAttr |= ASC_RET_ALLOCATED_MEMORY; + + *pOutput = BufferDesc; return ret; fail: return ret; @@ -703,7 +723,6 @@ ApplyControlToken(IN PCtxtHandle phContext, IN PSecBufferDesc pInput) { - UNIMPLEMENTED; return SEC_E_UNSUPPORTED_FUNCTION; } Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/credentials.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/credentials.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/credentials.c [iso-8859-1] Mon May 30 21:02:50 2011 @@ -53,7 +53,7 @@ /* sanity */ ASSERT(cred); - TRACE("%p refcount %d\n",cred, cred->RefCount); + TRACE("%p refcount %lx\n",cred, cred->RefCount); ASSERT(cred->RefCount > 0); /* reference */ @@ -73,7 +73,7 @@ /* sanity */ ASSERT(cred); - TRACE("%p refcount %d\n",cred, cred->RefCount); + TRACE("%p refcount %lx\n",cred, cred->RefCount); ASSERT(cred->RefCount >= 1); /* decrement reference */ @@ -137,7 +137,7 @@ { SECURITY_STATUS ret; - TRACE("(%p, %d, %p)\n", phCredential, ulAttribute, pBuffer); + TRACE("(%p, %lx, %p)\n", phCredential, ulAttribute, pBuffer); if(ulAttribute == SECPKG_ATTR_NAMES) { @@ -158,7 +158,7 @@ { SECURITY_STATUS ret; - TRACE("(%p, %d, %p)\n", phCredential, ulAttribute, pBuffer); + TRACE("(%p, %lx, %p)\n", phCredential, ulAttribute, pBuffer); if(ulAttribute == SECPKG_ATTR_NAMES) { Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlmssp.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlmssp.h [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlmssp.h [iso-8859-1] Mon May 30 21:02:50 2011 @@ -46,9 +46,12 @@ extern UNICODE_STRING NtlmComputerNameString; extern UNICODE_STRING NtlmDomainNameString; +extern UNICODE_STRING NtlmDnsNameString; extern OEM_STRING NtlmOemComputerNameString; extern OEM_STRING NtlmOemDomainNameString; +extern OEM_STRING NtlmOemDnsNameString; extern HANDLE NtlmSystemSecurityToken; +extern UNICODE_STRING NtlmAvTargetInfo; // contains AV pairs with local info typedef enum _NTLM_MODE { NtlmLsaMode = 1, Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/protocol.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/protocol.c [iso-8859-1] Mon May 30 21:02:50 2011 @@ -26,7 +26,7 @@ NtlmGenerateNegotiateMessage(IN ULONG_PTR Context, IN ULONG ContextReq, IN PSecBuffer InputToken, - OUT PSecBuffer *OutputToken) + OUT PSecBuffer OutputToken) { PNTLMSSP_CONTEXT context = (PNTLMSSP_CONTEXT)Context; PNTLMSSP_CREDENTIAL cred = context->Credential; @@ -35,13 +35,13 @@ ULONG_PTR offset; NTLM_BLOB blobBuffer[2]; //nego contains 2 blobs - if(!*OutputToken) + if(!OutputToken) { ERR("No output token!\n"); return SEC_E_BUFFER_TOO_SMALL; } - if(!((*OutputToken)->pvBuffer)) + if(!(OutputToken->pvBuffer)) { /* according to wine test */ ERR("No output buffer!\n"); @@ -56,23 +56,21 @@ if (!(ContextReq & ISC_REQ_ALLOCATE_MEMORY)) { /* not enough space */ - if(messageSize > (*OutputToken)->cbBuffer) + if(messageSize > OutputToken->cbBuffer) return SEC_E_BUFFER_TOO_SMALL; } else { /* allocate */ - (*OutputToken)->pvBuffer = NtlmAllocate(messageSize); - (*OutputToken)->cbBuffer = messageSize; - - if(!(*OutputToken)->pvBuffer) + OutputToken->pvBuffer = NtlmAllocate(messageSize); + OutputToken->cbBuffer = messageSize; + + if(!OutputToken->pvBuffer) return SEC_E_INSUFFICIENT_MEMORY; } /* allocate a negotiate message */ - message = (PNEGOTIATE_MESSAGE) NtlmAllocate(messageSize); - - if(!message) + if(!(message = (PNEGOTIATE_MESSAGE) NtlmAllocate(messageSize))) return SEC_E_INSUFFICIENT_MEMORY; /* build message */ @@ -110,11 +108,12 @@ blobBuffer[1].Offset = offset+1; } + /* zero struct */ memset(&message->Version, 0, sizeof(NTLM_WINDOWS_VERSION)); /* send it back */ - memcpy((*OutputToken)->pvBuffer, message, messageSize); - (*OutputToken)->cbBuffer = messageSize; + memcpy(OutputToken->pvBuffer, message, messageSize); + OutputToken->cbBuffer = messageSize; context->State = NegotiateSent; TRACE("context %p context->NegotiateFlags:\n",context); @@ -128,40 +127,53 @@ SECURITY_STATUS NtlmHandleNegotiateMessage(IN ULONG_PTR hCredential, - IN OUT PULONG_PTR phContext, + IN OUT ULONG_PTR hContext, IN ULONG ContextReq, IN PSecBuffer InputToken, - OUT PSecBuffer *pOutputToken, + IN PSecBuffer InputToken2, + OUT PSecBuffer OutputToken, + OUT PSecBuffer OutputToken2, OUT PULONG pContextAttr, OUT PTimeStamp ptsExpiry) { SECURITY_STATUS ret = SEC_E_OK; PNEGOTIATE_MESSAGE negoMessage = NULL; PNTLMSSP_CREDENTIAL cred = NULL; - PNTLMSSP_CONTEXT newContext = NULL; - - ERR("NtlmHandleNegotiateMessage called!\n"); - - /* InputToken should contain a negotiate message*/ + PNTLMSSP_CONTEXT context = NULL; + UNICODE_STRING targetName; + OEM_STRING OemDomainName, OemWorkstationName; + ULONG targetFlags = 0; + BOOLEAN isUnicode; + + TRACE("NtlmHandleNegotiateMessage hContext %lx\n", hContext); + if(!(context = NtlmAllocateContext())) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + ERR("SEC_E_INSUFFICIENT_MEMORY!\n"); + goto exit; + } + + hContext = (ULONG_PTR)context; + TRACE("NtlmHandleNegotiateMessage hContext %lx\n", hContext); + + /* InputToken should contain a negotiate message */ if(InputToken->cbBuffer > NTLM_MAX_BUF || InputToken->cbBuffer < sizeof(NEGOTIATE_MESSAGE)) { - ERR("Input token too big!!\n"); + ERR("Input wrong size!!\n"); ret = SEC_E_INVALID_TOKEN; goto exit; } /* allocate a buffer for it */ - negoMessage = NtlmAllocate(InputToken->cbBuffer); - - if(!negoMessage) + if(!(negoMessage = NtlmAllocate(sizeof(NEGOTIATE_MESSAGE)))) { ret = SEC_E_INSUFFICIENT_MEMORY; goto exit; } /* copy it */ - memcpy(negoMessage, InputToken->pvBuffer, InputToken->cbBuffer); + memcpy(negoMessage, InputToken->pvBuffer, sizeof(NEGOTIATE_MESSAGE)); /* validate it */ if(strncmp(negoMessage->Signature, NTLMSSP_SIGNATURE, 8) && @@ -176,9 +188,11 @@ NtlmPrintNegotiateFlags(negoMessage->NegotiateFlags); /* get credentials */ - cred = NtlmReferenceCredential(hCredential); - if(!cred) + if(!(cred = NtlmReferenceCredential(hCredential))) + { + ret = SEC_E_INVALID_TOKEN; goto exit; + } /* must be an incomming request */ if(!(cred->UseFlags & SECPKG_CRED_INBOUND)) @@ -187,72 +201,199 @@ goto exit; } - /* create new context */ - newContext = NtlmAllocateContext(); - if(!newContext) + /* convert flags */ + if(ContextReq & ASC_REQ_IDENTIFY) + { + *pContextAttr |= ASC_RET_IDENTIFY; + context->ContextFlags |= ASC_RET_IDENTIFY; + } + + if(ContextReq & ASC_REQ_DATAGRAM) + { + *pContextAttr |= ASC_RET_DATAGRAM; + context->ContextFlags |= ASC_RET_DATAGRAM; + } + + if(ContextReq & ASC_REQ_CONNECTION) + { + *pContextAttr |= ASC_RET_CONNECTION; + context->ContextFlags |= ASC_RET_CONNECTION; + } + + if(ContextReq & ASC_REQ_INTEGRITY) + { + *pContextAttr |= ASC_RET_INTEGRITY; + context->ContextFlags |= ASC_RET_INTEGRITY; + } + + if(ContextReq & ASC_REQ_REPLAY_DETECT) + { + *pContextAttr |= ASC_RET_REPLAY_DETECT; + context->ContextFlags |= ASC_RET_REPLAY_DETECT; + } + + if(ContextReq & ASC_REQ_SEQUENCE_DETECT) + { + *pContextAttr |= ASC_RET_SEQUENCE_DETECT; + context->ContextFlags |= ASC_RET_SEQUENCE_DETECT; + } + + if(ContextReq & ASC_REQ_ALLOW_NULL_SESSION) + { + context->ContextFlags |= ASC_REQ_ALLOW_NULL_SESSION; + } + + if(ContextReq & ASC_REQ_ALLOW_NON_USER_LOGONS) + { + *pContextAttr |= ASC_RET_ALLOW_NON_USER_LOGONS; + context->ContextFlags |= ASC_RET_ALLOW_NON_USER_LOGONS; + } + + /* encryption */ + if(ContextReq & ASC_REQ_CONFIDENTIALITY) + { + *pContextAttr |= ASC_RET_CONFIDENTIALITY; + context->ContextFlags |= ASC_RET_CONFIDENTIALITY; + } + + if (negoMessage->NegotiateFlags & NTLMSSP_NEGOTIATE_EXTENDED_SESSIONSECURITY || + negoMessage->NegotiateFlags & NTLMSSP_REQUEST_TARGET) + { + targetFlags |= NTLMSSP_TARGET_TYPE_SERVER | NTLMSSP_REQUEST_TARGET | NTLMSSP_NEGOTIATE_TARGET_INFO; + + if (negoMessage->NegotiateFlags & NTLMSSP_NEGOTIATE_UNICODE) + { + isUnicode = TRUE; + targetFlags |= NTLMSSP_NEGOTIATE_UNICODE; + RtlInitUnicodeString(&targetName, NtlmComputerNameString.Buffer); + } + else if(negoMessage->NegotiateFlags & NTLMSSP_NEGOTIATE_OEM) + { + isUnicode = FALSE; + targetFlags |= NTLMSSP_NEGOTIATE_OEM; + RtlInitUnicodeString(&targetName, (PWCHAR)&NtlmOemComputerNameString.Buffer); + } + else + { + ret = SEC_E_INVALID_TOKEN; + ERR("flags invalid!\n"); + goto exit; + } + } + + /* create a challenge message */ + PCHALLENGE_MESSAGE chaMessage = NULL; + ULONG messageSize = sizeof(CHALLENGE_MESSAGE)+ targetName.Length + 1 + NtlmAvTargetInfo.Length; + ULONG offset; + + /* ntlm does not listen to ASC_REQ_ALLOCATE_MEMORY or lack thereof */ + /* further more the buffer size is always NTLM_MAX_BUF */ + /* allocate output buffer */ + OutputToken->pvBuffer = NtlmAllocate(NTLM_MAX_BUF); + OutputToken->cbBuffer = messageSize; + + if(!OutputToken->pvBuffer) { ret = SEC_E_INSUFFICIENT_MEMORY; goto exit; } - *phContext = (ULONG_PTR)newContext; - - if(ContextReq & ASC_REQ_IDENTIFY) - { + /* allocate message */ + if (!(chaMessage = (PCHALLENGE_MESSAGE)NtlmAllocate(messageSize))) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + goto exit; + } + + TRACE("message %p size %lu\n", chaMessage, messageSize); + + /* build message */ + strcpy(chaMessage->Signature, NTLMSSP_SIGNATURE); + chaMessage->MsgType = NtlmChallenge; + chaMessage->NegotiateFlags = context->NegotiateFlags; + chaMessage->NegotiateFlags |= NTLMSSP_NEGOTIATE_NTLM; + + /* generate challenge */ + NtlmGenerateRandomBits(chaMessage->ServerChallenge, MSV1_0_CHALLENGE_LENGTH); + memcpy(context->Challenge, chaMessage->ServerChallenge, MSV1_0_CHALLENGE_LENGTH); + + offset = (ULONG_PTR)(chaMessage+1); + + if(negoMessage->NegotiateFlags & NTLMSSP_NEGOTIATE_EXTENDED_SESSIONSECURITY) + { + negoMessage->NegotiateFlags &= ~NTLMSSP_NEGOTIATE_LM_KEY; + chaMessage->NegotiateFlags |= NTLMSSP_NEGOTIATE_EXTENDED_SESSIONSECURITY; + } + else if(negoMessage->NegotiateFlags & NTLMSSP_NEGOTIATE_LM_KEY) + { + chaMessage->NegotiateFlags |= NTLMSSP_NEGOTIATE_LM_KEY; + } + + if(negoMessage->NegotiateFlags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN) + chaMessage->NegotiateFlags |= NTLMSSP_NEGOTIATE_ALWAYS_SIGN; + + if(negoMessage->NegotiateFlags & NTLMSSP_NEGOTIATE_SIGN) + { + chaMessage->NegotiateFlags |= NTLMSSP_NEGOTIATE_SIGN; + *pContextAttr |= (ASC_RET_SEQUENCE_DETECT | ASC_RET_REPLAY_DETECT); + context->ContextFlags |= (ASC_RET_SEQUENCE_DETECT | ASC_RET_REPLAY_DETECT); + } + + if (negoMessage->NegotiateFlags & NTLMSSP_NEGOTIATE_SEAL) + { + chaMessage->NegotiateFlags |= NTLMSSP_NEGOTIATE_SEAL; + *pContextAttr |= ASC_RET_CONFIDENTIALITY; + context->ContextFlags |= ASC_RET_CONFIDENTIALITY; + } + + if(negoMessage->NegotiateFlags & NTLMSSP_NEGOTIATE_KEY_EXCH) + chaMessage->NegotiateFlags |= NTLMSSP_NEGOTIATE_KEY_EXCH; + + /* client requested encryption */ + if(negoMessage->NegotiateFlags & NTLMSSP_NEGOTIATE_128) + chaMessage->NegotiateFlags |= NTLMSSP_NEGOTIATE_128; + else if(negoMessage->NegotiateFlags & NTLMSSP_NEGOTIATE_56) + chaMessage->NegotiateFlags |= NTLMSSP_NEGOTIATE_56; + + if(negoMessage->NegotiateFlags & NTLMSSP_REQUEST_INIT_RESP) + { + chaMessage->NegotiateFlags |= NTLMSSP_REQUEST_INIT_RESP; *pContextAttr |= ASC_RET_IDENTIFY; - newContext->ContextFlags |= ASC_RET_IDENTIFY; - } - - if(ContextReq & ASC_REQ_DATAGRAM) - { - *pContextAttr |= ASC_RET_DATAGRAM; - newContext->ContextFlags |= ASC_RET_DATAGRAM; - } - - if(ContextReq & ASC_REQ_CONNECTION) - { - *pContextAttr |= ASC_RET_CONNECTION; - newContext->ContextFlags |= ASC_RET_CONNECTION; - } - - if(ContextReq & ASC_REQ_INTEGRITY) - { - *pContextAttr |= ASC_RET_INTEGRITY; - newContext->ContextFlags |= ASC_RET_INTEGRITY; - } - - if(ContextReq & ASC_REQ_REPLAY_DETECT) - { - *pContextAttr |= ASC_RET_REPLAY_DETECT; - newContext->ContextFlags |= ASC_RET_REPLAY_DETECT; - } - - if(ContextReq & ASC_REQ_SEQUENCE_DETECT) - { - *pContextAttr |= ASC_RET_SEQUENCE_DETECT; - newContext->ContextFlags |= ASC_RET_SEQUENCE_DETECT; - } - - if(ContextReq & ASC_REQ_ALLOW_NULL_SESSION) - { - newContext->ContextFlags |= ASC_REQ_ALLOW_NULL_SESSION; - } - - if(ContextReq & ASC_REQ_ALLOW_NON_USER_LOGONS) - { - *pContextAttr |= ASC_RET_ALLOW_NON_USER_LOGONS; - newContext->ContextFlags |= ASC_RET_ALLOW_NON_USER_LOGONS; - } - - /* encryption */ - if(ContextReq & ASC_REQ_CONFIDENTIALITY) - { - *pContextAttr |= ASC_RET_CONFIDENTIALITY; - newContext->ContextFlags |= ASC_RET_CONFIDENTIALITY; - } + context->ContextFlags |= ASC_RET_IDENTIFY; + } + + /* check for local call */ + if((negoMessage->NegotiateFlags & NTLMSSP_NEGOTIATE_OEM_DOMAIN_SUPPLIED) && + (negoMessage->NegotiateFlags & NTLMSSP_NEGOTIATE_OEM_WORKSTATION_SUPPLIED)) + { + NtlmBlobToUnicodeString(InputToken, negoMessage->OemDomainName, (PUNICODE_STRING)&OemDomainName); + NtlmBlobToUnicodeString(InputToken, negoMessage->OemWorkstationName, (PUNICODE_STRING)&OemWorkstationName); + + if (RtlEqualString(&OemWorkstationName, &NtlmOemComputerNameString, FALSE)&& + RtlEqualString(&OemDomainName, &NtlmOemDomainNameString, FALSE)) + { + TRACE("local negotiate detected!\n"); + chaMessage->NegotiateFlags |= NTLMSSP_NEGOTIATE_LOCAL_CALL; + } + } + + NtlmUnicodeStringToBlob((PVOID)chaMessage, &targetName, &chaMessage->TargetName, &offset); + NtlmUnicodeStringToBlob((PVOID)chaMessage, &NtlmAvTargetInfo, &chaMessage->TargetInfo, &offset); + chaMessage->NegotiateFlags |= targetFlags; + + memcpy(OutputToken->pvBuffer, chaMessage, messageSize); + OutputToken->cbBuffer = messageSize; + context->State = ChallengeSent; + ret = SEC_I_CONTINUE_NEEDED; exit: - ERR("FIXME: HERE!!!!!!!!!!!!!!!"); + if(chaMessage) NtlmFree(chaMessage); + if(negoMessage) NtlmFree(negoMessage); + if(cred) NtlmDereferenceCredential((ULONG_PTR)cred); + if(targetName.Buffer) NtlmFree(targetName.Buffer); + if(OemDomainName.Buffer) NtlmFree(OemDomainName.Buffer); + if(OemWorkstationName.Buffer) NtlmFree(OemWorkstationName.Buffer); + return ret; } @@ -261,59 +402,60 @@ IN ULONG ContextReq, IN PSecBuffer InputToken1, IN PSecBuffer InputToken2, - IN OUT PSecBuffer *OutputToken1, - IN OUT PSecBuffer *OutputToken2, + IN OUT PSecBuffer OutputToken1, + IN OUT PSecBuffer OutputToken2, OUT PULONG pContextAttr, OUT PTimeStamp ptsExpiry, OUT PULONG NegotiateFlags) { SECURITY_STATUS ret = SEC_E_OK; - PNTLMSSP_CONTEXT context; - PCHALLENGE_MESSAGE challenge; + PNTLMSSP_CONTEXT context = NULL; + PCHALLENGE_MESSAGE challenge = NULL; + PNTLMSSP_CREDENTIAL cred = NULL; BOOLEAN isUnicode; + TRACE("NtlmHandleChallengeMessage hContext %lx\n", hContext); /* get context */ context = NtlmReferenceContext(hContext); if(!context || !context->Credential) { ERR("NtlmHandleChallengeMessage invalid handle!\n"); ret = SEC_E_INVALID_HANDLE; - goto exit; + goto fail; } /* re-authenticate call */ if(context->State == AuthenticateSent) { UNIMPLEMENTED; + goto fail; } else if(context->State != NegotiateSent) { - ERR("Context not in negotiate sent state!\n"); + ERR("Context not in correct state!\n"); ret = SEC_E_OUT_OF_SEQUENCE; - goto exit; + goto fail; } /* InputToken1 should contain a challenge message */ - TRACE("input token size %lx\n", InputToken1->cbBuffer); if(InputToken1->cbBuffer > NTLM_MAX_BUF || InputToken1->cbBuffer < sizeof(CHALLENGE_MESSAGE)) { ERR("Input token invalid!\n"); ret = SEC_E_INVALID_TOKEN; - goto exit; + goto fail; } /* allocate a buffer for it */ - challenge = NtlmAllocate(InputToken1->cbBuffer); - if(!challenge) + if(!(challenge = NtlmAllocate(sizeof(CHALLENGE_MESSAGE)))) { ERR("failed to allocate challenge buffer!\n"); ret = SEC_E_INSUFFICIENT_MEMORY; - goto exit; + goto fail; } /* copy it */ - memcpy(challenge, InputToken1->pvBuffer, InputToken1->cbBuffer); + memcpy(challenge, InputToken1->pvBuffer, sizeof(CHALLENGE_MESSAGE)); /* validate it */ if(strncmp(challenge->Signature, NTLMSSP_SIGNATURE, 8) && @@ -321,14 +463,14 @@ { ERR("Input message not valid!\n"); ret = SEC_E_INVALID_TOKEN; - goto exit; + goto fail; } TRACE("Got valid challege message! with flags:\n"); NtlmPrintNegotiateFlags(challenge->NegotiateFlags); /* print challenge message and payloads */ - NtlmPrintHexDump((PBYTE)challenge, InputToken1->cbBuffer); + NtlmPrintHexDump((PBYTE)InputToken1->pvBuffer, InputToken1->cbBuffer); if(challenge->NegotiateFlags & NTLMSSP_NEGOTIATE_DATAGRAM) { @@ -364,14 +506,14 @@ /* these flags must be bad! */ ERR("challenge flags did not specify unicode or oem!\n"); ret = SEC_E_INVALID_TOKEN; - goto exit; + goto fail; } /* support ntlm2 */ if(challenge->NegotiateFlags & NTLMSSP_NEGOTIATE_EXTENDED_SESSIONSECURITY) { challenge->NegotiateFlags &= ~NTLMSSP_NEGOTIATE_LM_KEY; - context->NegotiateFlags &= ~(NTLMSSP_NEGOTIATE_LM_KEY); + context->NegotiateFlags &= ~NTLMSSP_NEGOTIATE_LM_KEY; } else { @@ -383,7 +525,7 @@ { ERR("netware authentication not supported!!!\n"); ret = SEC_E_UNSUPPORTED_FUNCTION; - goto exit; + goto fail; } } @@ -430,7 +572,7 @@ if(!NT_SUCCESS(ret)) { ERR("could not get target info!\n"); - goto exit; + goto fail; } } else @@ -444,20 +586,23 @@ if(!NT_SUCCESS(ret)) { ERR("could not get target info!\n"); - goto exit; + goto fail; } if(isUnicode) FIXME("convert to unicode!\n"); } - TRACE("ServerName %s\n", debugstr_w(ServerName.Buffer)); - - PNTLMSSP_CREDENTIAL cred = NtlmReferenceCredential((ULONG_PTR)context->Credential); + + MSV1_0_NTLM3_RESPONSE NtResponse; LM2_RESPONSE Lm2Response; USER_SESSION_KEY UserSessionKey; LM_SESSION_KEY LmSessionKey; - NtlmUnProtectMemory(cred->Password.Buffer, cred->Password.Length * sizeof(WCHAR)); + if(!(cred = NtlmReferenceCredential((ULONG_PTR)context->Credential))) + goto fail; + + /* unscramble password */ + NtlmUnProtectMemory(cred->Password.Buffer, cred->Password.Length); TRACE("cred: %s %s %s\n", debugstr_w(cred->UserName.Buffer), debugstr_w(cred->Password.Buffer), debugstr_w(cred->DomainName.Buffer)); @@ -472,9 +617,255 @@ &UserSessionKey, &LmSessionKey); -exit: + PAUTHENTICATE_MESSAGE authmessage = NULL; + ULONG_PTR offset; + + UNICODE_STRING NtResponseString; + //UNICODE_STRING LmResponseString; + UNICODE_STRING UserSessionKeyString; + UNICODE_STRING LmSessionKeyString; + +#define InitString(str, input) str.MaximumLength = str.Length = sizeof(input)*sizeof(WCHAR); str.Buffer = (WCHAR*)&input + InitString(NtResponseString, NtResponse); + //InitString(LmResponseString, Lm2Response); + InitString(UserSessionKeyString, UserSessionKey); + InitString(LmSessionKeyString, LmSessionKey); + + ULONG messageSize = sizeof(AUTHENTICATE_MESSAGE) + + ServerName.Length + cred->UserName.Length + cred->DomainName.Length + + NtResponseString.Length + UserSessionKeyString.Length + LmSessionKeyString.Length; + //LmResponseString.Length; + + if(!(authmessage = NtlmAllocate(messageSize))) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + goto fail; + } + + strcpy(authmessage->Signature, NTLMSSP_SIGNATURE); + authmessage->MsgType = NtlmAuthenticate; + + offset = (ULONG_PTR)(authmessage+1); + + NtlmUnicodeStringToBlob((PVOID)authmessage, + &cred->DomainName, + &authmessage->DomainName, + &offset); + + NtlmUnicodeStringToBlob((PVOID)authmessage, + &cred->UserName, + &authmessage->UserName, + &offset); + + NtlmUnicodeStringToBlob((PVOID)authmessage, + &ServerName, + &authmessage->WorkstationName, + &offset); + + //if(targetinfo) + //NtlmUnicodeStringToBlob((PVOID)authmessage, + // &LmResponseString, + // &authmessage->LmChallengeResponse, + // &offset); + + NtlmUnicodeStringToBlob((PVOID)authmessage, + &NtResponseString, + &authmessage->NtChallengeResponse, + &offset); + + NtlmUnicodeStringToBlob((PVOID)authmessage, + &UserSessionKeyString, + &authmessage->EncryptedRandomSessionKey, + &offset); + + /* if should not allocate */ + if (!(ContextReq & ISC_REQ_ALLOCATE_MEMORY)) + { + /* not enough space */ + if(messageSize > OutputToken1->cbBuffer) + { + ret = SEC_E_BUFFER_TOO_SMALL; + goto fail; + } + } + else + { + /* allocate */ + if(!(OutputToken1->pvBuffer = NtlmAllocate(messageSize))) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + goto fail; + } + } + + OutputToken1->cbBuffer = messageSize; /* says wine test */ + memcpy(OutputToken1->pvBuffer, authmessage, messageSize); + context->State = AuthenticateSent; + ret = SEC_E_OK; + +fail: + if(authmessage) NtlmFree(authmessage); + if(context) NtlmDereferenceContext((ULONG_PTR)context); + if(cred) NtlmDereferenceCredential((ULONG_PTR)cred); ERR("handle challenge end\n"); - return ret; } +SECURITY_STATUS +NtlmHandleAuthenticateMessage(IN ULONG_PTR hContext, + IN ULONG ContextReq, + IN PSecBuffer InputToken, + OUT PSecBuffer OutputToken, + OUT PULONG pContextAttr, + OUT PTimeStamp ptsExpiry, + OUT PUCHAR pSessionKey, + OUT PULONG pfUserFlags) +{ + SECURITY_STATUS ret = SEC_E_OK; + PNTLMSSP_CONTEXT context = NULL; + PAUTHENTICATE_MESSAGE authMessage = NULL; + BOOLEAN isUnicode; + + TRACE("NtlmHandleAuthenticateMessage hContext %x!\n", hContext); + /* get context */ + if(!(context = NtlmReferenceContext(hContext))) + { + ret = SEC_E_INVALID_HANDLE; + goto fail; + } + + TRACE("context->State %d\n", context->State); + if(context->State != ChallengeSent || context->State != Authenticated) + { + ERR("Context not in correct state!\n"); + ret = SEC_E_OUT_OF_SEQUENCE; + goto fail; + } + + /* re-authorize */ + if(context->State == Authenticated) + UNIMPLEMENTED; + + /* InputToken1 should contain a authenticate message */ + TRACE("input token size %lx\n", InputToken->cbBuffer); + if(InputToken->cbBuffer > NTLM_MAX_BUF || + InputToken->cbBuffer < sizeof(AUTHENTICATE_MESSAGE)) + { + ERR("Input token invalid!\n"); + ret = SEC_E_INVALID_TOKEN; + goto fail; + } + + /* allocate a buffer for it */ + if(!(authMessage = NtlmAllocate(sizeof(AUTHENTICATE_MESSAGE)))) + { + ERR("failed to allocate authMessage buffer!\n"); + ret = SEC_E_INSUFFICIENT_MEMORY; + goto fail; + } + + /* copy it */ + memcpy(authMessage, InputToken->pvBuffer, sizeof(AUTHENTICATE_MESSAGE)); + + /* validate it */ + if(strncmp(authMessage->Signature, NTLMSSP_SIGNATURE, 8) && + authMessage->MsgType == NtlmAuthenticate) + { + ERR("Input message not valid!\n"); + ret = SEC_E_INVALID_TOKEN; + goto fail; + } + + /* datagram */ + if(context->NegotiateFlags & NTLMSSP_NEGOTIATE_DATAGRAM) + { + /* context and message dont agree on connection type! */ + if(!(authMessage->NegotiateFlags & NTLMSSP_NEGOTIATE_DATAGRAM)) + { + ret = SEC_E_INVALID_TOKEN; + goto fail; + } + + /* use message flags */ + context->NegotiateFlags = authMessage->NegotiateFlags; + + /* need a key */ + if(context->NegotiateFlags & (NTLMSSP_NEGOTIATE_SIGN | NTLMSSP_NEGOTIATE_SEAL)) + context->NegotiateFlags |= NTLMSSP_NEGOTIATE_KEY_EXCH; + + /* remove lm key */ + if (context->NegotiateFlags & NTLMSSP_NEGOTIATE_EXTENDED_SESSIONSECURITY) + context->NegotiateFlags &= ~NTLMSSP_NEGOTIATE_LM_KEY; + } + + /* supports unicode */ + if(context->NegotiateFlags & NTLMSSP_NEGOTIATE_UNICODE) + { + context->NegotiateFlags &= ~NTLMSSP_NEGOTIATE_OEM; + isUnicode = TRUE; + } + else if(context->NegotiateFlags & NTLMSSP_NEGOTIATE_OEM) + { + context->NegotiateFlags &= ~NTLMSSP_NEGOTIATE_UNICODE; + isUnicode = FALSE; + } + else + { + /* these flags must be bad! */ + ERR("authenticate flags did not specify unicode or oem!\n"); + ret = SEC_E_INVALID_TOKEN; + goto fail; + } + + UNICODE_STRING LmChallengeResponse, NtChallengeResponse, SessionKey; + UNICODE_STRING UserName, Workstation, DomainName; + + if(!NT_SUCCESS(NtlmBlobToUnicodeString(InputToken, + authMessage->LmChallengeResponse, &LmChallengeResponse))) + { + ret = SEC_E_INVALID_TOKEN; + goto fail; + } + + if(!NT_SUCCESS(NtlmBlobToUnicodeString(InputToken, + authMessage->NtChallengeResponse, &NtChallengeResponse))) + { + ret = SEC_E_INVALID_TOKEN; + goto fail; + } + + if(!NT_SUCCESS(NtlmBlobToUnicodeString(InputToken, + authMessage->UserName, &UserName))) + { + ret = SEC_E_INVALID_TOKEN; + goto fail; + } + + if(!NT_SUCCESS(NtlmBlobToUnicodeString(InputToken, + authMessage->WorkstationName, &Workstation))) + { + ret = SEC_E_INVALID_TOKEN; + goto fail; + } + + if(!NT_SUCCESS(NtlmBlobToUnicodeString(InputToken, + authMessage->DomainName, &DomainName))) + { + ret = SEC_E_INVALID_TOKEN; + goto fail; + } + + //if(NTLMSSP_NEGOTIATE_KEY_EXCHANGE) + if(!NT_SUCCESS(NtlmBlobToUnicodeString(InputToken, + authMessage->EncryptedRandomSessionKey, &SessionKey))) + { + ret = SEC_E_INVALID_TOKEN; + goto fail; + } + + ret = SEC_I_COMPLETE_NEEDED; + +fail: + NtlmDereferenceContext((ULONG_PTR)context); + return ret; +} Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/protocol.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/protocol.h [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/protocol.h [iso-8859-1] Mon May 30 21:02:50 2011 @@ -164,6 +164,14 @@ /* payload */ }AUTHENTICATE_MESSAGE, *PAUTHENTICATE_MESSAGE; +typedef struct _MESSAGE_SIGNATURE +{ + ULONG Version; + ULONG RandomPad; + ULONG Checksum; + ULONG Nonce; +}MESSAGE_SIGNATURE, *PMESSAGE_SIGNATURE; + /* basic functions */ VOID @@ -173,14 +181,14 @@ VOID NTOWFv2( - PWCHAR password, - PWCHAR user, - PWCHAR domain, + const PWCHAR password, + const PWCHAR user, + const PWCHAR domain, PUCHAR result); VOID LMOWFv1( - PCCHAR password, + const PCCHAR password, PUCHAR result); VOID @@ -275,15 +283,17 @@ IN ULONG_PTR hContext, IN ULONG ContextReq, IN PSecBuffer InputToken, - OUT PSecBuffer *OutputToken); + OUT PSecBuffer OutputToken); SECURITY_STATUS NtlmHandleNegotiateMessage( IN ULONG_PTR hCredential, - IN OUT PULONG_PTR phContext, + IN OUT ULONG_PTR hContext, IN ULONG fContextReq, - IN PSecBuffer InputToken, - OUT PSecBuffer *OutputToken, + IN PSecBuffer InputToken1, + IN PSecBuffer InputToken2, + OUT PSecBuffer OutputToken1, + OUT PSecBuffer OutputToken2, OUT PULONG pContextAttr, OUT PTimeStamp ptsExpiry); @@ -293,8 +303,8 @@ IN ULONG ContextReq, IN PSecBuffer InputToken1, IN PSecBuffer InputToken2, - IN OUT PSecBuffer *OutputToken1, - IN OUT PSecBuffer *OutputToken2, + IN OUT PSecBuffer OutputToken1, + IN OUT PSecBuffer OutputToken2, OUT PULONG ContextAttr, OUT PTimeStamp ptsExpiry, OUT PULONG NegotiateFlags); @@ -303,15 +313,11 @@ NtlmHandleAuthenticateMessage( IN ULONG_PTR hContext, IN ULONG fContextReq, - IN PSecBuffer *pInputTokens, + IN PSecBuffer InputToken, OUT PSecBuffer OutputToken, OUT PULONG pContextAttr, OUT PTimeStamp ptsExpiry, OUT PUCHAR pSessionKey, - OUT PULONG pfNegotiateFlags, - OUT PHANDLE TokenHandle, - OUT PNTSTATUS pSubStatus, - OUT PTimeStamp ptsPasswordExpiry, OUT PULONG pfUserFlags); /* helper functions */

1 0

[cgutman] 52013: [AFD] - Launch a new listen IRP right after the current one completes instead of waiting until the current pending connection is accepted - Reduces the chance of AFD missing two co...
by cgutman＠svn.reactos.org 30 May '11

30 May '11

Author: cgutman Date: Mon May 30 17:27:53 2011 New Revision: 52013 URL: http://svn.reactos.org/svn/reactos?rev=52013&view=rev Log: [AFD] - Launch a new listen IRP right after the current one completes instead of waiting until the current pending connection is accepted - Reduces the chance of AFD missing two connection requests that are issued very close together and increases network performance by allowing our connection queue to do its job Modified: trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/tdiconn.c trunk/reactos/drivers/network/afd/include/afd.h trunk/reactos/drivers/network/afd/include/tdiconn.h Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Mon May 30 17:27:53 2011 @@ -178,17 +178,30 @@ ListEntry ) ); } - if( FCB->ListenIrp.ConnectionCallInfo ) { - ExFreePool( FCB->ListenIrp.ConnectionCallInfo ); - FCB->ListenIrp.ConnectionCallInfo = NULL; - } - - if( FCB->ListenIrp.ConnectionReturnInfo ) { - ExFreePool( FCB->ListenIrp.ConnectionReturnInfo ); - FCB->ListenIrp.ConnectionReturnInfo = NULL; - } - - FCB->NeedsNewListen = TRUE; + /* Launch new accept socket */ + Status = WarmSocketForConnection( FCB ); + + if (NT_SUCCESS(Status)) + { + Status = TdiBuildNullConnectionInfoInPlace(FCB->ListenIrp.ConnectionCallInfo, + FCB->LocalAddress->Address[0].AddressType); + ASSERT(Status == STATUS_SUCCESS); + + Status = TdiBuildNullConnectionInfoInPlace(FCB->ListenIrp.ConnectionReturnInfo, + FCB->LocalAddress->Address[0].AddressType); + ASSERT(Status == STATUS_SUCCESS); + + Status = TdiListen( &FCB->ListenIrp.InFlightRequest, + FCB->Connection.Object, + &FCB->ListenIrp.ConnectionCallInfo, + &FCB->ListenIrp.ConnectionReturnInfo, + &FCB->ListenIrp.Iosb, + ListenComplete, + FCB ); + + if (Status == STATUS_PENDING) + Status = STATUS_SUCCESS; + } /* Trigger a select return if appropriate */ if( !IsListEmpty( &FCB->PendingConnections ) ) { @@ -263,9 +276,6 @@ if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; - - if (NT_SUCCESS(Status)) - FCB->NeedsNewListen = FALSE; AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); @@ -323,48 +333,6 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - if( FCB->NeedsNewListen ) { - AFD_DbgPrint(MID_TRACE,("ADDRESSFILE: %x\n", FCB->AddressFile.Handle)); - - /* Launch new accept socket */ - Status = WarmSocketForConnection( FCB ); - - if( Status == STATUS_SUCCESS ) { - Status = TdiBuildNullConnectionInfo - ( &FCB->ListenIrp.ConnectionCallInfo, - FCB->LocalAddress->Address[0].AddressType ); - - if (!NT_SUCCESS(Status)) return UnlockAndMaybeComplete(FCB, Status, Irp, 0); - - Status = TdiBuildNullConnectionInfo - ( &FCB->ListenIrp.ConnectionReturnInfo, - FCB->LocalAddress->Address[0].AddressType ); - - if (!NT_SUCCESS(Status)) - { - ExFreePool(FCB->ListenIrp.ConnectionCallInfo); - FCB->ListenIrp.ConnectionCallInfo = NULL; - return UnlockAndMaybeComplete(FCB, Status, Irp, 0); - } - - Status = TdiListen( &FCB->ListenIrp.InFlightRequest, - FCB->Connection.Object, - &FCB->ListenIrp.ConnectionCallInfo, - &FCB->ListenIrp.ConnectionReturnInfo, - &FCB->ListenIrp.Iosb, - ListenComplete, - FCB ); - - if( Status == STATUS_PENDING ) - Status = STATUS_SUCCESS; - - if( !NT_SUCCESS(Status) ) - return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); - - FCB->NeedsNewListen = FALSE; - } else return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); - } - for( PendingConn = FCB->PendingConnections.Flink; PendingConn != &FCB->PendingConnections; PendingConn = PendingConn->Flink ) { Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] Mon May 30 17:27:53 2011 @@ -77,7 +77,7 @@ return A; } -static NTSTATUS TdiBuildNullConnectionInfoInPlace +NTSTATUS TdiBuildNullConnectionInfoInPlace ( PTDI_CONNECTION_INFORMATION ConnInfo, ULONG Type ) /* Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Mon May 30 17:27:53 2011 @@ -179,7 +179,7 @@ PVOID CurrentThread; PFILE_OBJECT FileObject; PAFD_DEVICE_EXTENSION DeviceExt; - BOOLEAN DelayedAccept, NeedsNewListen; + BOOLEAN DelayedAccept; UINT ConnSeq; PTRANSPORT_ADDRESS LocalAddress, RemoteAddress; PTDI_CONNECTION_INFORMATION AddressFrom, ConnectInfo; Modified: trunk/reactos/drivers/network/afd/include/tdiconn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/tdiconn.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/tdiconn.h [iso-8859-1] Mon May 30 17:27:53 2011 @@ -19,7 +19,7 @@ ( PTDI_CONNECTION_INFORMATION ConnInfo, PTRANSPORT_ADDRESS Name ); NTSTATUS TdiBuildConnectionInfo ( PTDI_CONNECTION_INFORMATION *ConnectionInfo, PTRANSPORT_ADDRESS Name ); -NTSTATUS TdiBuildNullConnectionInfoToPlace +NTSTATUS TdiBuildNullConnectionInfoInPlace ( PTDI_CONNECTION_INFORMATION ConnInfo, ULONG Type ); NTSTATUS TdiBuildNullConnectionInfo ( PTDI_CONNECTION_INFORMATION *ConnectionInfo, ULONG Type );

1 0

[tkreuzer] 52012: [WIN32K] - Implement GreAddFontResourceInternal - Refactor EngLoadFontFileFD once again - Load Tahoma font after initializing the font driver (hack)
by tkreuzer＠svn.reactos.org 30 May '11

30 May '11

Author: tkreuzer Date: Mon May 30 17:19:46 2011 New Revision: 52012 URL: http://svn.reactos.org/svn/reactos?rev=52012&view=rev Log: [WIN32K] - Implement GreAddFontResourceInternal - Refactor EngLoadFontFileFD once again - Load Tahoma font after initializing the font driver (hack) Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c [iso-8859-1] Mon May 30 17:19:46 2011 @@ -30,9 +30,7 @@ HSEMAPHORE ghsemFontDriver; LIST_ENTRY gleFontDriverList = {&gleFontDriverList, &gleFontDriverList}; -HSEMAPHORE ghsemPFFList; -LIST_ENTRY glePFFList = {&glePFFList, &glePFFList}; - +extern HSEMAPHORE ghsemPFFList; BOOL FASTCALL InitFontSupport(VOID) @@ -60,141 +58,6 @@ ASSERT(gbAttachedCSRSS); KeUnstackDetachProcess(pApcState); gbAttachedCSRSS = FALSE; -} - -static -HFF -FONTDEV_hffLoadFontFile( - PFONTDEV pfntdev, - ULONG cFiles, - ULONG_PTR *piFile, - PVOID *ppvView, - ULONG *pcjView, - DESIGNVECTOR *pdv, - ULONG ulLangID, - ULONG ulFastCheckSum) -{ - HFF hff; - ASSERT(gbAttachedCSRSS); - - /* Call the drivers DrvLoadFontFile function */ - hff = pfntdev->pldev->pfn.LoadFontFile(cFiles, - piFile, - ppvView, - pcjView, - pdv, - ulLangID, - ulFastCheckSum); - - if (hff == 0) return 0; - - return hff; -} - -static -HFF -EngLoadFontFileFD( - ULONG cFiles, - PFONTFILEVIEW *ppffv, - DESIGNVECTOR *pdv, - ULONG ulCheckSum, - PFONTDEV *ppfntdev) -{ - PULONG_PTR piFiles = (PULONG_PTR)ppffv; - PVOID apvView[FD_MAX_FILES]; - ULONG acjView[FD_MAX_FILES]; - ULONG i, ulLangID = 0; - PFONTDEV pfntdev; - PLIST_ENTRY ple; - HFF hff = 0; - - /* Loop all files */ - for (i = 0; i < cFiles; i++) - { - /* Map the font file */ - if (!EngMapFontFileFD(piFiles[i], (PULONG*)&apvView[i], &acjView[i])) - { - ASSERT(FALSE); - } - } - - /* Acquire font driver list lock */ - EngAcquireSemaphore(ghsemFontDriver); - - /* Loop all installed font drivers */ - for (ple = gleFontDriverList.Flink; - ple != &gleFontDriverList; - ple = ple->Flink) - { - pfntdev = CONTAINING_RECORD(ple, FONTDEV, leLink); - - /* Try to load the font file */ - hff = FONTDEV_hffLoadFontFile(pfntdev, - cFiles, - piFiles, - apvView, - acjView, - pdv, - ulLangID, - ulCheckSum); - if (hff) - { - *ppfntdev = pfntdev; - break; - } - } - - /* Release font friver list lock */ - EngReleaseSemaphore(ghsemFontDriver); - - return hff; -} - -static -BOOL -PFF_bCompareFiles( - PPFF ppff, - ULONG cFiles, - PFONTFILEVIEW pffv[]) -{ - ULONG i; - - /* Check if number of files matches */ - if (ppff->cFiles != cFiles) return FALSE; - - /* Loop all files */ - for (i = 0; i < cFiles; i++) - { - /* Check if the files match */ - if (pffv[i] != ppff->apffv[i]) return FALSE; - } - - return TRUE; -} - -static PPFF -EngFindPFF(ULONG cFiles, PFONTFILEVIEW *ppffv) -{ - PLIST_ENTRY ple; - PPFF ppff; - ASSERT(cFiles >= 1 && cFiles <= FD_MAX_FILES); - - /* Acquire PFF list lock */ - EngAcquireSemaphore(ghsemPFFList); - - /* Loop all physical font files (PFF) */ - for (ple = glePFFList.Flink; ple != &glePFFList; ple = ple->Flink) - { - ppff = CONTAINING_RECORD(ple, PFF, leLink); - - /* Check if the files are already loaded */ - if (PFF_bCompareFiles(ppff, cFiles, ppffv)) break; - } - - /* Release PFF list lock */ - EngReleaseSemaphore(ghsemPFFList); - - return ple != &glePFFList ? ppff : NULL; } static void @@ -245,45 +108,59 @@ PPFF NTAPI -EngLoadFontFile( - IN ULONG cFiles, - IN PWCHAR apwszFiles[], - IN DESIGNVECTOR *pdv) -{ - PFONTFILEVIEW apffv[FD_MAX_FILES]; +EngLoadFontFileFD( + ULONG cFiles, + PFONTFILEVIEW *ppffv, + DESIGNVECTOR *pdv, + ULONG ulCheckSum) +{ + PULONG_PTR piFiles = (PULONG_PTR)ppffv; + PVOID apvView[FD_MAX_FILES]; + ULONG acjView[FD_MAX_FILES]; KAPC_STATE ApcState; + PLIST_ENTRY ple; + PFONTDEV pfntdev = NULL; + HFF hff = 0; + ULONG cFaces, cjSize, i, ulLangID = 0; PPFF ppff = NULL; - ULONG i, cjSize, cFaces, ulChecksum = 0; - PFONTDEV pfntdev = NULL; - HFF hff; - - /* Loop the files */ - for (i = 0; i < cFiles; i++) - { - /* Try to load the file */ - apffv[i] = (PVOID)EngLoadModuleEx(apwszFiles[i], 0, FVF_FONTFILE); - if (!apffv[i]) - { - /* Cleanup and return */ - while (i--) EngFreeModule(apffv[i]); - return NULL; - } - } - - /* Try to find an existing PFF */ - ppff = EngFindPFF(cFiles, apffv); - if (ppff) - { - /* Cleanup loaded files, we don't need them anymore */ - for (i = 0; i < cFiles; i++) EngFreeModule(apffv[i]); - return ppff; - } /* Attach to CSRSS */ AttachCSRSS(&ApcState); - /* Try to load the font with any of the font drivers */ - hff = EngLoadFontFileFD(cFiles, apffv, pdv, ulChecksum, &pfntdev); + /* Loop all files */ + for (i = 0; i < cFiles; i++) + { + /* Map the font file */ + if (!EngMapFontFileFD(piFiles[i], (PULONG*)&apvView[i], &acjView[i])) + { + ASSERT(FALSE); + } + } + + /* Acquire font driver list lock */ + EngAcquireSemaphore(ghsemFontDriver); + + /* Loop all installed font drivers */ + for (ple = gleFontDriverList.Flink; + ple != &gleFontDriverList; + ple = ple->Flink) + { + pfntdev = CONTAINING_RECORD(ple, FONTDEV, leLink); + + /* Call the drivers DrvLoadFontFile function */ + hff = pfntdev->pldev->pfn.LoadFontFile(cFiles, + piFiles, + apvView, + acjView, + pdv, + ulLangID, + ulCheckSum); + if (hff) break; + } + + /* Release font driver list lock */ + EngReleaseSemaphore(ghsemFontDriver); + if (!hff) { DPRINT1("File format is not supported by any font driver\n"); @@ -310,7 +187,7 @@ ppff->hff = hff; /* Copy the FONTFILEVIEW pointers */ - for (i = 0; i < cFiles; i++) ppff->apffv[i] = apffv[i]; + for (i = 0; i < cFiles; i++) ppff->apffv[i] = ppffv[i]; /* Loop all faces in the font file */ for (i = 0; i < cFaces; i++) @@ -319,16 +196,7 @@ PFE_vInitialize(&ppff->apfe[i], ppff, i + 1); } - /* Insert the PFF into the list */ - EngAcquireSemaphore(ghsemPFFList); - InsertTailList(&glePFFList, &ppff->leLink); - EngReleaseSemaphore(ghsemPFFList); - leave: - if (!ppff) - { - for (i = 0; i < cFiles; i++) EngFreeModule(apffv[i]); - } /* Detach from CSRSS */ DetachCSRSS(&ApcState); @@ -393,6 +261,9 @@ NTAPI GreStartupFontDrivers(VOID) { + ULONG cFonts; + static PWSTR pwszFile = L"\\??\\c:\\ReactOS\\Fonts\\tahoma.ttf"; + /* Load freetype font driver */ if (!EngLoadFontDriver(L"ftfd.dll")) { @@ -403,5 +274,10 @@ /* TODO: Enumerate installed font drivers */ DPRINT1("############ Started font drivers\n"); -} - + + // lets load some fonts + cFonts = GreAddFontResourceInternal(&pwszFile, 1, 0, 0, NULL); + ASSERT(cFonts > 0); + +} + Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c [iso-8859-1] Mon May 30 17:19:46 2011 @@ -11,19 +11,98 @@ #define NDEBUG #include <debug.h> +HSEMAPHORE ghsemPFFList; +static LIST_ENTRY glePrivatePFFList = {&glePrivatePFFList, &glePrivatePFFList}; +static LIST_ENTRY glePublicPFFList = {&glePublicPFFList, &glePublicPFFList}; + +static +BOOL +PFF_bCompareFiles( + PPFF ppff, + ULONG cFiles, + PFONTFILEVIEW pffv[]) +{ + ULONG i; + + /* Check if number of files matches */ + if (ppff->cFiles != cFiles) return FALSE; + + /* Loop all files */ + for (i = 0; i < cFiles; i++) + { + /* Check if the files match */ + if (pffv[i] != ppff->apffv[i]) return FALSE; + } + + return TRUE; +} + INT NTAPI GreAddFontResourceInternal( IN PWCHAR apwszFiles[], IN ULONG cFiles, - IN FLONG f, + IN FLONG fl, IN DWORD dwPidTid, IN OPTIONAL DESIGNVECTOR *pdv) { - - - ASSERT(FALSE); - return 0; + PFONTFILEVIEW apffv[FD_MAX_FILES]; + PPFF ppff = NULL; + PLIST_ENTRY ple, pleListHead; + ULONG i, ulCheckSum = 0; + + /* Loop the files */ + for (i = 0; i < cFiles; i++) + { + /* Try to load the file */ + apffv[i] = (PVOID)EngLoadModuleEx(apwszFiles[i], 0, FVF_FONTFILE); + if (!apffv[i]) + { + DPRINT1("Failed to load file: '%ls'\n", apwszFiles[i]); + /* Cleanup and return */ + while (i--) EngFreeModule(apffv[i]); + return 0; + } + } + + pleListHead = fl & FR_PRIVATE ? &glePrivatePFFList : &glePublicPFFList; + + /* Acquire PFF list lock */ + EngAcquireSemaphore(ghsemPFFList); + + /* Loop all physical font files (PFF) */ + for (ple = pleListHead->Flink; ple != pleListHead; ple = ple->Flink) + { + ppff = CONTAINING_RECORD(ple, PFF, leLink); + + /* Check if the files are already loaded */ + if (PFF_bCompareFiles(ppff, cFiles, apffv)) break; + } + + /* Release PFF list lock */ + EngReleaseSemaphore(ghsemPFFList); + + if (ple == pleListHead) + { + /* Cleanup loaded files, we don't need them anymore */ + for (i = 0; i < cFiles; i++) EngFreeModule(apffv[i]); + return ppff->cFonts; + } + + /* Load the font file with a font driver */ + ppff = EngLoadFontFileFD(cFiles, apffv, pdv, ulCheckSum); + if (!ppff) + { + DPRINT1("Failed to load font with font driver\n"); + return 0; + } + + /* Insert the PFF into the list */ + EngAcquireSemaphore(ghsemPFFList); + InsertTailList(pleListHead, &ppff->leLink); + EngReleaseSemaphore(ghsemPFFList); + + return ppff->cFonts; } static Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h [iso-8859-1] Mon May 30 17:19:46 2011 @@ -220,4 +220,20 @@ NTAPI DC_prfnt(PDC pdc); - +PPFF +NTAPI +EngLoadFontFileFD( + ULONG cFiles, + PFONTFILEVIEW *ppffv, + DESIGNVECTOR *pdv, + ULONG ulCheckSum); + +INT +NTAPI +GreAddFontResourceInternal( + IN PWCHAR apwszFiles[], + IN ULONG cFiles, + IN FLONG fl, + IN DWORD dwPidTid, + IN OPTIONAL DESIGNVECTOR *pdv); +

1 0

[tkreuzer] 52011: [WIN32K] - Implement InitMappingImpl that initializes ghsemModuleList - Use ZwCreateSection in EngLoadModuleEx. This is overhead in terms of code and runtime, but is neccessary, s...
by tkreuzer＠svn.reactos.org 30 May '11

30 May '11

Author: tkreuzer Date: Mon May 30 17:16:08 2011 New Revision: 52011 URL: http://svn.reactos.org/svn/reactos?rev=52011&view=rev Log: [WIN32K] - Implement InitMappingImpl that initializes ghsemModuleList - Use ZwCreateSection in EngLoadModuleEx. This is overhead in terms of code and runtime, but is neccessary, since we cannot pass a kernel file handle to MmCreateSection and passing a file object pointer is not supported on reactos yet. - Set proper access mask and page protection in EngLoadModuleEx Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/main/dllmain.c Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] Mon May 30 17:16:08 2011 @@ -14,6 +14,16 @@ HANDLE ghSystem32Directory; HSEMAPHORE ghsemModuleList; LIST_ENTRY gleModulelist = {&gleModulelist, &gleModulelist}; + +INIT_FUNCTION +NTSTATUS +NTAPI +InitMappingImpl(VOID) +{ + ghsemModuleList = EngCreateSemaphore(); + if (!ghsemModuleList) return STATUS_NO_MEMORY; + return STATUS_SUCCESS; +} PVOID NTAPI @@ -222,11 +232,12 @@ UNICODE_STRING ustrFileName; IO_STATUS_BLOCK IoStatusBlock; FILE_BASIC_INFORMATION FileInformation; - HANDLE hFile = NULL; + HANDLE hFile = NULL, hSection; NTSTATUS Status; LARGE_INTEGER liSize; PLIST_ENTRY ple; - ULONG cjSize; + ULONG cjSize, flPageProtect; + ACCESS_MASK amAccess; /* Acquire module list lock */ EngAcquireSemaphore(ghsemModuleList); @@ -245,6 +256,18 @@ /* Use system32 root dir or absolute path */ hRootDir = fl & FVF_SYSTEMROOT ? ghSystem32Directory : NULL; + + /* Set access mask and page protection */ + if (fl & FVF_WRITE) + { + amAccess = FILE_READ_DATA|FILE_WRITE_DATA; + flPageProtect = PAGE_EXECUTE_READWRITE; + } + else + { + amAccess = FILE_READ_DATA; + flPageProtect = PAGE_EXECUTE_READ; + } /* Initialize unicode string and object attributes */ RtlInitUnicodeString(&ustrFileName, pwsz); @@ -256,7 +279,7 @@ /* Now open the file */ Status = ZwCreateFile(&hFile, - FILE_READ_DATA, + amAccess, &ObjectAttributes, &IoStatusBlock, NULL, @@ -328,14 +351,24 @@ /* Create a section from the file */ liSize.QuadPart = cjSizeOfModule; - Status = MmCreateSection(&pFileView->pSection, + Status = ZwCreateSection(&hSection, SECTION_ALL_ACCESS, NULL, cjSizeOfModule ? &liSize : NULL, - fl & FVF_READONLY ? PAGE_EXECUTE_READ : PAGE_EXECUTE_READWRITE, + flPageProtect, SEC_COMMIT, - hFile, - NULL); + hFile); + + if (NT_SUCCESS(Status)) + { + Status = ObReferenceObjectByHandle(hSection, + SECTION_ALL_ACCESS, + MmSectionObjectType, + KernelMode, + &pFileView->pSection, + NULL); + ZwClose(hSection); + } if (!NT_SUCCESS(Status)) { @@ -362,7 +395,7 @@ EngLoadModule(LPWSTR pwsz) { /* Forward to EngLoadModuleEx */ - return (HANDLE)EngLoadModuleEx(pwsz, 0, FVF_READONLY | FVF_SYSTEMROOT); + return EngLoadModuleEx(pwsz, 0, FVF_SYSTEMROOT); } HANDLE @@ -372,7 +405,7 @@ IN ULONG cjSizeOfModule) { /* Forward to EngLoadModuleEx */ - return (HANDLE)EngLoadModuleEx(pwsz, cjSizeOfModule, FVF_SYSTEMROOT); + return EngLoadModuleEx(pwsz, cjSizeOfModule, FVF_WRITE|FVF_SYSTEMROOT); } PVOID Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h [iso-8859-1] Mon May 30 17:16:08 2011 @@ -38,9 +38,14 @@ enum { FVF_SYSTEMROOT = 1, - FVF_READONLY = 2, + FVF_WRITE = 2, FVF_FONTFILE = 4, }; + +INIT_FUNCTION +NTSTATUS +NTAPI +InitMappingImpl(VOID); PVOID NTAPI Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Mon May 30 17:16:08 2011 @@ -138,9 +138,9 @@ DPRINT1("Shell process is exiting (%d)\n", ExitCode); - UserPostMessage(hwndSAS, - WM_LOGONNOTIFY, - LN_SHELL_EXITED, + UserPostMessage(hwndSAS, + WM_LOGONNOTIFY, + LN_SHELL_EXITED, ExitCode); } } @@ -534,6 +534,7 @@ CreateStockObjects(); CreateSysColorObjects(); + NT_ROF(InitMappingImpl()); NT_ROF(InitXlateImpl()); NT_ROF(InitPDEVImpl()); NT_ROF(InitLDEVImpl());

1 0

[tkreuzer] 52010: [NDK] Add NTKERNELAPI to MmSectionObjectType to be able to import it
by tkreuzer＠svn.reactos.org 30 May '11

30 May '11

Author: tkreuzer Date: Mon May 30 16:51:17 2011 New Revision: 52010 URL: http://svn.reactos.org/svn/reactos?rev=52010&view=rev Log: [NDK] Add NTKERNELAPI to MmSectionObjectType to be able to import it Modified: branches/GSoC_2011/GdiFontDriver/include/ndk/mmtypes.h Modified: branches/GSoC_2011/GdiFontDriver/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/include… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/include/ndk/mmtypes.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/include/ndk/mmtypes.h [iso-8859-1] Mon May 30 16:51:17 2011 @@ -704,7 +704,7 @@ // // Long VAD used in section and private allocations // -typedef struct _MMVAD_LONG +typedef struct _MMVAD_LONG { union { @@ -969,7 +969,7 @@ // // Section Object Type // -extern POBJECT_TYPE MmSectionObjectType; +extern NTKERNELAPI POBJECT_TYPE MmSectionObjectType; #endif // !NTOS_MODE_USER

1 0

[khornicek] 52009: [WINED3D|DDRAW|D3D8|D3D9] Sync to Wine 1.3.21
by khornicek＠svn.reactos.org 30 May '11

30 May '11

Author: khornicek Date: Mon May 30 15:27:19 2011 New Revision: 52009 URL: http://svn.reactos.org/svn/reactos?rev=52009&view=rev Log: [WINED3D|DDRAW|D3D8|D3D9] Sync to Wine 1.3.21 Added: trunk/reactos/include/reactos/wine/wined3d.h (with props) Removed: trunk/reactos/dll/directx/wine/wined3d/basetexture.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c trunk/reactos/dll/directx/wine/wined3d/volumetexture.c trunk/reactos/include/reactos/wine/wined3d.idl Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c trunk/reactos/dll/directx/wine/d3d8/cubetexture.c trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/shader.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d8/volumetexture.c trunk/reactos/dll/directx/wine/d3d9/buffer.c trunk/reactos/dll/directx/wine/d3d9/cubetexture.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/shader.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/d3d9/volumetexture.c trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt trunk/reactos/dll/directx/wine/ddraw/clipper.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/executebuffer.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/material.c trunk/reactos/dll/directx/wine/ddraw/palette.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/ddraw/utils.c trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c trunk/reactos/dll/directx/wine/ddraw/viewport.c trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/clipper.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/gl_compat.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/shader.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c trunk/reactos/dll/directx/wine/wined3d/view.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/CMakeLists.txt trunk/reactos/include/reactos/wine/wineheaders.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/buff… Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/cube… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/shad… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d8/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/buff… Modified: trunk/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/cube… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Modified: trunk/reactos/dll/directx/wine/d3d9/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/shad… Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/CMa… Modified: trunk/reactos/dll/directx/wine/ddraw/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/cli… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe… Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Modified: trunk/reactos/dll/directx/wine/ddraw/material.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mat… Modified: trunk/reactos/dll/directx/wine/ddraw/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/pal… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… Modified: trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ver… Modified: trunk/reactos/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/vie… Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Removed: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Removed: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Removed: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Removed: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Removed: trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Removed: trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Removed: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/reactos/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/CMake… Added: trunk/reactos/include/reactos/wine/wined3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Removed: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Modified: trunk/reactos/include/reactos/wine/wineheaders.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wineh…

1 0

[nyadav] 52008: [AUDSRV] Fix RPC Connection and Remove Test Apps
by nyadav＠svn.reactos.org 30 May '11

30 May '11

Author: nyadav Date: Mon May 30 13:20:20 2011 New Revision: 52008 URL: http://svn.reactos.org/svn/reactos?rev=52008&view=rev Log: [AUDSRV] Fix RPC Connection and Remove Test Apps Removed: branches/nyadav-audio-branch/base/services/testc/ branches/nyadav-audio-branch/base/services/tests/ Modified: branches/nyadav-audio-branch/base/services/CMakeLists.txt branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c Modified: branches/nyadav-audio-branch/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/CMakeLists.txt [iso-8859-1] Mon May 30 13:20:20 2011 @@ -7,8 +7,6 @@ add_subdirectory(svchost) add_subdirectory(tcpsvcs) add_subdirectory(telnetd) -add_subdirectory(tests) -add_subdirectory(testc) #add_subdirectory(tftpd) add_subdirectory(umpnpmgr) add_subdirectory(wlansvc) Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/CMakeLists.txt [iso-8859-1] Mon May 30 13:20:20 2011 @@ -1,3 +1,4 @@ +set_unicode() include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs) Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Mon May 30 13:20:20 2011 @@ -8,7 +8,7 @@ WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance) { RPC_STATUS status; - unsigned char * pszStringBinding = NULL; + unsigned short * pszStringBinding = NULL; if(clientstream == NULL ) return -1; @@ -29,7 +29,7 @@ RpcTryExcept { - AUDInitStream (&audsrv_v0_0_c_ifspec); + AUDInitStream (audsrv_v0_0_c_ifspec); } RpcExcept(1) {

1 0

[nyadav] 52007: [AUDSRV] Use Unicode versions of RPC functions
by nyadav＠svn.reactos.org 30 May '11

30 May '11

Author: nyadav Date: Mon May 30 12:37:20 2011 New Revision: 52007 URL: http://svn.reactos.org/svn/reactos?rev=52007&view=rev Log: [AUDSRV] Use Unicode versions of RPC functions Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Mon May 30 12:37:20 2011 @@ -16,9 +16,9 @@ /*Validity of all other data will be checked at server*/ /*Check Connection Status If not connected call Connect()*/ /*If connected Properly call the remote audsrv_initstream() function*/ - status = RpcStringBindingCompose(NULL,L"ncacn_np",NULL,L"\\pipe\\audsrv", NULL,&pszStringBinding); + status = RpcStringBindingComposeW(NULL,L"ncacn_np",NULL,L"\\pipe\\audsrv", NULL,&pszStringBinding); - status = RpcBindingFromStringBinding(pszStringBinding, &audsrv_v0_0_c_ifspec); + status = RpcBindingFromStringBindingW(pszStringBinding, &audsrv_v0_0_c_ifspec); if (status) printf("Connection Problem p %d \n",status);

1 0

[rharabien] 52006: [ROSTESTS] - Declare functions with 0 arguments using VOID keyword. In C it matters - Add imagehlp winetest to CMake build
by rharabien＠svn.reactos.org 30 May '11

30 May '11

Author: rharabien Date: Mon May 30 11:40:58 2011 New Revision: 52006 URL: http://svn.reactos.org/svn/reactos?rev=52006&view=rev Log: [ROSTESTS] - Declare functions with 0 arguments using VOID keyword. In C it matters - Add imagehlp winetest to CMake build Added: trunk/rostests/winetests/imagehlp/CMakeLists.txt (with props) Modified: trunk/rostests/apitests/w32knapi/w32knapi.h trunk/rostests/drivers/kmtest/kmtest.h trunk/rostests/dxtest/win32kdxtest/test.h trunk/rostests/tests/DxHalTest/main.h trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.h [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h [iso-8859-1] Mon May 30 11:40:58 2011 @@ -40,7 +40,7 @@ BOOL IsHandleValid(HGDIOBJ hobj); PVOID GetHandleUserData(HGDIOBJ hobj); DWORD Syscall(LPWSTR lpszFunction, int cParams, void* pParams); -BOOL InitOsVersion(); +BOOL InitOsVersion(VOID); extern UINT g_OsIdx; typedef UINT ASPI[5]; Modified: trunk/rostests/drivers/kmtest/kmtest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/kmtest.h?r… ============================================================================== --- trunk/rostests/drivers/kmtest/kmtest.h [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/kmtest.h [iso-8859-1] Mon May 30 11:40:58 2011 @@ -29,7 +29,7 @@ extern tls_data glob_data; -VOID StartTest(); +VOID StartTest(VOID); VOID FinishTest(HANDLE KeyHandle, LPWSTR TestName); void kmtest_set_location(const char* file, int line); Modified: trunk/rostests/dxtest/win32kdxtest/test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/test.… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/test.h [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/test.h [iso-8859-1] Mon May 30 11:40:58 2011 @@ -1,8 +1,8 @@ -HANDLE test_NtGdiDdCreateDirectDrawObject(); +HANDLE test_NtGdiDdCreateDirectDrawObject(void); void test_NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal); -void test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal); +void test_NtGdiDdQueryDirectDrawObject(HANDLE hDirectDrawLocal); void test_NtGdiDdGetScanLine(HANDLE hDirectDrawLocal); void test_NtGdiDdWaitForVerticalBlank(HANDLE hDirectDrawLocal); void test_NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal); Modified: trunk/rostests/tests/DxHalTest/main.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/DxHalTest/main.h?re… ============================================================================== --- trunk/rostests/tests/DxHalTest/main.h [iso-8859-1] (original) +++ trunk/rostests/tests/DxHalTest/main.h [iso-8859-1] Mon May 30 11:40:58 2011 @@ -3,7 +3,7 @@ #include <d3dhal.h> -int StartupHAL (); +int StartupHAL (VOID); extern HDC hdc; extern DDRAWI_DIRECTDRAW_GBL mDDrawGlobal; extern DDRAWI_DIRECTDRAW_LCL mDDrawLocal; Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Mon May 30 11:40:58 2011 @@ -22,6 +22,7 @@ add_subdirectory(gdiplus) add_subdirectory(hlink) add_subdirectory(icmp) +add_subdirectory(imagehlp) add_subdirectory(imm32) add_subdirectory(inetcomm) add_subdirectory(inetmib1) Added: trunk/rostests/winetests/imagehlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imagehlp/CMakeL… ============================================================================== --- trunk/rostests/winetests/imagehlp/CMakeLists.txt (added) +++ trunk/rostests/winetests/imagehlp/CMakeLists.txt [iso-8859-1] Mon May 30 11:40:58 2011 @@ -1,0 +1,15 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + image.c + integrity.c + testlist.c) + +add_executable(imagehlp_winetest ${SOURCE}) +target_link_libraries(imagehlp_winetest wine uuid) +set_module_type(imagehlp_winetest win32cui) +add_importlibs(imagehlp_winetest advapi32 msvcrt kernel32 ntdll) +add_cd_file(TARGET imagehlp_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/imagehlp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

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