Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 40503: Fix some parameter sizes in gdi32.spec (handles are pointer sized), there's probably a lot more.
by tkreuzer＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: tkreuzer Date: Tue Apr 14 20:16:18 2009 New Revision: 40503 URL: http://svn.reactos.org/svn/reactos?rev=40503&view=rev Log: Fix some parameter sizes in gdi32.spec (handles are pointer sized), there's probably a lot more. Modified: trunk/reactos/dll/win32/gdi32/gdi32.spec Modified: trunk/reactos/dll/win32/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.spec… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] Tue Apr 14 20:16:18 2009 @@ -1,12 +1,12 @@ -@ stdcall AbortDoc(long) -@ stdcall AbortPath(long) +@ stdcall AbortDoc(ptr) +@ stdcall AbortPath(ptr) @ stdcall AddFontMemResourceEx(ptr long ptr ptr) @ stdcall AddFontResourceA(str) @ stdcall AddFontResourceExA(str long ptr) @ stdcall AddFontResourceExW(wstr long ptr) @ stdcall AddFontResourceTracking(str long) @ stdcall AddFontResourceW(wstr) -@ stdcall AngleArc(long long long long long long) +@ stdcall AngleArc(ptr long long long long long) @ stdcall AnimatePalette(long long long ptr) @ stdcall AnyLinkedFonts() NtGdiAnyLinkedFonts @ stdcall Arc(long long long long long long long long long) @@ -360,8 +360,8 @@ @ stdcall GetColorSpace(long) @ stdcall GetCurrentObject(long long) @ stdcall GetCurrentPositionEx(long ptr) -@ stdcall GetDCBrushColor(long) -@ stdcall GetDCOrgEx(long ptr) +@ stdcall GetDCBrushColor(ptr) +@ stdcall GetDCOrgEx(ptr ptr) @ stdcall GetDCPenColor(long) @ stdcall GetDIBColorTable(long long long ptr) @ stdcall GetDIBits(long long long long ptr ptr long)

1 0

[tkreuzer] 40502: Return NULL, if failed to lock the provided palette in InrEngCreateXlate. Fixes bug 4378. See issue #4378 for more details.
by tkreuzer＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: tkreuzer Date: Tue Apr 14 20:06:07 2009 New Revision: 40502 URL: http://svn.reactos.org/svn/reactos?rev=40502&view=rev Log: Return NULL, if failed to lock the provided palette in InrEngCreateXlate. Fixes bug 4378. See issue #4378 for more details. Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Tue Apr 14 20:06:07 2009 @@ -177,9 +177,23 @@ DestPalGDI = PALETTE_LockPalette(PaletteDest); if (SourcePalType == 0) + { + if (!SourcePalGDI) + { + DPRINT1("Failed to lock source palette %p\n", PaletteSource); + return NULL; + } SourcePalType = SourcePalGDI->Mode; + } if (DestPalType == 0) + { + if (!DestPalGDI) + { + DPRINT1("Failed to lock dest palette %p\n", PaletteDest); + return NULL; + } DestPalType = DestPalGDI->Mode; + } XlateObj->iSrcType = SourcePalType; XlateObj->iDstType = DestPalType;

1 0

[gschneider] 40501: - Replace ConvertStringSecurityDescriptorToSecurityDescriptorW with the more advanced wine version, fixes a memory corruption advapi32 security winetest caused and the correspondent user mode crash (requested by Christoph_vW) - Update and move helper functions, remove unreferenced functions - Update readme.wine for advapi32 security files (we use a different structure and only parts of wine's implementation)
by gschneider＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: gschneider Date: Tue Apr 14 19:36:39 2009 New Revision: 40501 URL: http://svn.reactos.org/svn/reactos?rev=40501&view=rev Log: - Replace ConvertStringSecurityDescriptorToSecurityDescriptorW with the more advanced wine version, fixes a memory corruption advapi32 security winetest caused and the correspondent user mode crash (requested by Christoph_vW) - Update and move helper functions, remove unreferenced functions - Update readme.wine for advapi32 security files (we use a different structure and only parts of wine's implementation) Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Tue Apr 14 19:36:39 2009 @@ -303,370 +303,6 @@ return !status; } -static BOOL -FindKeyInTable( - IN const RECORD* Table, - IN LPCWSTR Key, - OUT SIZE_T* pKeyLength, - OUT DWORD* pItem) -{ - const RECORD* pRecord = Table; - while (pRecord->key != NULL) - { - if (wcsncmp(pRecord->key, Key, wcslen(pRecord->key)) == 0) - { - *pKeyLength = wcslen(pRecord->key); - *pItem = pRecord->value; - return TRUE; - } - pRecord++; - } - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; -} - -static BOOL -ParseSidString( - IN LPCWSTR Buffer, - OUT PSID* pSid, - OUT SIZE_T* pLength) -{ - WCHAR str[SDDL_ALIAS_SIZE + 1]; - LPWSTR strSid; - LPCWSTR end; - BOOL ret; - DWORD i; - - wcsncpy(str, Buffer, SDDL_ALIAS_SIZE); - for (i = SDDL_ALIAS_SIZE; i > 0; i--) - { - str[i] = UNICODE_NULL; - if (ConvertStringSidToSidW(str, pSid)) - { - *pLength = i; - return TRUE; - } - } - - end = wcschr(Buffer, SDDL_ACE_ENDC); - if (!end) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - strSid = (LPWSTR)LocalAlloc(0, (end - Buffer) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); - if (!strSid) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - wcsncpy(strSid, Buffer, end - Buffer + 1); - strSid[end - Buffer] = UNICODE_NULL; - *pLength = end - Buffer; - ret = ConvertStringSidToSidW(strSid, pSid); - LocalFree(strSid); - return ret; -} - -static const RECORD DaclFlagTable[] = -{ - { SDDL_PROTECTED, SE_DACL_PROTECTED }, - { SDDL_AUTO_INHERIT_REQ, SE_DACL_AUTO_INHERIT_REQ }, - { SDDL_AUTO_INHERITED, SE_DACL_AUTO_INHERITED }, - { NULL, 0 }, -}; - -static const RECORD SaclFlagTable[] = -{ - { SDDL_PROTECTED, SE_SACL_PROTECTED }, - { SDDL_AUTO_INHERIT_REQ, SE_SACL_AUTO_INHERIT_REQ }, - { SDDL_AUTO_INHERITED, SE_SACL_AUTO_INHERITED }, - { NULL, 0 }, -}; - -static const RECORD AceFlagTable[] = -{ - { SDDL_CONTAINER_INHERIT, CONTAINER_INHERIT_ACE }, - { SDDL_OBJECT_INHERIT, OBJECT_INHERIT_ACE }, - { SDDL_NO_PROPAGATE, NO_PROPAGATE_INHERIT_ACE }, - { SDDL_INHERIT_ONLY, INHERIT_ONLY_ACE }, - { SDDL_INHERITED, INHERITED_ACE }, - { SDDL_AUDIT_SUCCESS, SUCCESSFUL_ACCESS_ACE_FLAG }, - { SDDL_AUDIT_FAILURE, FAILED_ACCESS_ACE_FLAG }, - { NULL, 0 }, -}; - -static BOOL -ParseFlagsString( - IN LPCWSTR Buffer, - IN const RECORD* FlagTable, - IN WCHAR LimitChar, - OUT DWORD* pFlags, - OUT SIZE_T* pLength) -{ - LPCWSTR ptr = Buffer; - SIZE_T PartialLength; - DWORD Flag; - - *pFlags = 0; - while (*ptr != LimitChar) - { - if (!FindKeyInTable(FlagTable, ptr, &PartialLength, &Flag)) - return FALSE; - *pFlags |= Flag; - ptr += PartialLength; - } - *pLength = ptr - Buffer; - return TRUE; -} - -static const RECORD AccessMaskTable[] = -{ - { SDDL_GENERIC_ALL, GENERIC_ALL }, - { SDDL_GENERIC_READ, GENERIC_READ }, - { SDDL_GENERIC_WRITE, GENERIC_WRITE }, - { SDDL_GENERIC_EXECUTE, GENERIC_EXECUTE }, - { SDDL_READ_CONTROL, READ_CONTROL }, - { SDDL_STANDARD_DELETE, DELETE }, - { SDDL_WRITE_DAC, WRITE_DAC }, - { SDDL_WRITE_OWNER, WRITE_OWNER }, - { SDDL_READ_PROPERTY, ADS_RIGHT_DS_READ_PROP }, - { SDDL_WRITE_PROPERTY, ADS_RIGHT_DS_WRITE_PROP }, - { SDDL_CREATE_CHILD, ADS_RIGHT_DS_CREATE_CHILD }, - { SDDL_DELETE_CHILD, ADS_RIGHT_DS_DELETE_CHILD }, - { SDDL_LIST_CHILDREN, ADS_RIGHT_ACTRL_DS_LIST }, - { SDDL_SELF_WRITE, ADS_RIGHT_DS_SELF }, - { SDDL_LIST_OBJECT, ADS_RIGHT_DS_LIST_OBJECT }, - { SDDL_DELETE_TREE, ADS_RIGHT_DS_DELETE_TREE }, - { SDDL_CONTROL_ACCESS, ADS_RIGHT_DS_CONTROL_ACCESS }, - { SDDL_FILE_ALL, FILE_ALL_ACCESS }, - { SDDL_FILE_READ, FILE_GENERIC_READ }, - { SDDL_FILE_WRITE, FILE_GENERIC_WRITE }, - { SDDL_FILE_EXECUTE, FILE_GENERIC_EXECUTE }, - { SDDL_KEY_ALL, KEY_ALL_ACCESS }, - { SDDL_KEY_READ, KEY_READ }, - { SDDL_KEY_WRITE, KEY_WRITE }, - { SDDL_KEY_EXECUTE, KEY_EXECUTE }, - { NULL, 0 }, -}; - -static BOOL -ParseAccessMaskString( - IN LPCWSTR Buffer, - OUT DWORD* pAccessMask, - OUT SIZE_T* pLength) -{ - LPCWSTR szAcl = Buffer; - BOOL RetVal = FALSE; - LPCWSTR ptr; - - if ((*szAcl == '0') && (*(szAcl + 1) == 'x')) - { - LPCWSTR p = szAcl; - - while (*p && *p != ';') - p++; - - if (p - szAcl <= 10 /* 8 hex digits + "0x" */ ) - { - *pAccessMask = strtoulW(szAcl, NULL, 16); - ptr = wcschr(Buffer, SDDL_SEPERATORC); - if (ptr) - { - *pLength = ptr - Buffer; - RetVal = TRUE; - } - } - } - else - { - RetVal = ParseFlagsString(Buffer, AccessMaskTable, SDDL_SEPERATORC, pAccessMask, pLength); - } - - return RetVal; - } - -static BOOL -ParseGuidString( - IN LPCWSTR Buffer, - OUT GUID* pGuid, - OUT BOOL* pIsGuidValid, - OUT SIZE_T* pLength) -{ - WCHAR GuidStr[MAX_GUID_STRING_LEN + 1]; - LPCWSTR end; - - end = wcschr(Buffer, SDDL_SEPERATORC); - if (!end) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - *pLength = end - Buffer; - *pIsGuidValid = (end != Buffer); - if (!*pIsGuidValid) - return TRUE; - - if (end - Buffer > MAX_GUID_STRING_LEN - 1) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - GuidStr[end - Buffer] = UNICODE_NULL; - wcsncpy(GuidStr, Buffer, end - Buffer); - if (RPC_S_OK != UuidFromStringW((unsigned short*)&GuidStr, pGuid)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - return TRUE; -} - -static const RECORD AceTypeTable[] = -{ - { SDDL_OBJECT_ACCESS_ALLOWED, ACCESS_ALLOWED_OBJECT_ACE_TYPE }, - { SDDL_OBJECT_ACCESS_DENIED, ACCESS_DENIED_OBJECT_ACE_TYPE }, - { SDDL_AUDIT, SYSTEM_AUDIT_ACE_TYPE }, - { SDDL_ALARM, SYSTEM_ALARM_ACE_TYPE }, - { SDDL_OBJECT_AUDIT, SYSTEM_AUDIT_OBJECT_ACE_TYPE }, - { SDDL_OBJECT_ALARM, SYSTEM_ALARM_OBJECT_ACE_TYPE }, - { SDDL_ACCESS_ALLOWED, ACCESS_ALLOWED_ACE_TYPE }, - { SDDL_ACCESS_DENIED, ACCESS_DENIED_ACE_TYPE }, - { NULL, 0 }, -}; - -static BOOL -ParseAceString( - IN LPCWSTR Buffer, - IN PACL pAcl, - OUT SIZE_T* pLength) -{ - LPCWSTR ptr = Buffer; - SIZE_T PartialLength; - DWORD aceType, aceFlags, accessMask; - GUID object, inheritObject; - BOOL objectValid, inheritObjectValid; - PSID sid = NULL; - BOOL ret; - - if (*ptr != SDDL_ACE_BEGINC) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - ptr++; /* Skip SDDL_ACE_BEGINC */ - - if (!FindKeyInTable(AceTypeTable, ptr, &PartialLength, &aceType)) - return FALSE; - ptr += PartialLength; - - if (*ptr != SDDL_SEPERATORC) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - ptr++; /* Skip SDDL_SEPERATORC */ - - if (!ParseFlagsString(ptr, AceFlagTable, SDDL_SEPERATORC, &aceFlags, &PartialLength)) - return FALSE; - ptr += PartialLength + 1; - - if (!ParseAccessMaskString(ptr, &accessMask, &PartialLength)) - return FALSE; - ptr += PartialLength + 1; - - if (!ParseGuidString(ptr, &object, &objectValid, &PartialLength)) - return FALSE; - ptr += PartialLength + 1; - - if (!ParseGuidString(ptr, &inheritObject, &inheritObjectValid, &PartialLength)) - return FALSE; - ptr += PartialLength + 1; - - if (!ParseSidString(ptr, &sid, &PartialLength)) - return FALSE; - ptr += PartialLength; - if (*ptr != SDDL_ACE_ENDC) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - ptr++; /* Skip SDDL_ACE_ENDC */ - *pLength = ptr - Buffer; - - switch (aceType) - { - case ACCESS_ALLOWED_ACE_TYPE: - ret = AddAccessAllowedAceEx( - pAcl, - ACL_REVISION_DS, - aceFlags, - accessMask, - sid); - break; - case ACCESS_ALLOWED_OBJECT_ACE_TYPE: - ret = AddAccessAllowedObjectAce( - pAcl, - ACL_REVISION_DS, - aceFlags, - accessMask, - objectValid ? &object : NULL, - inheritObjectValid ? &inheritObject : NULL, - sid); - break; - case ACCESS_DENIED_ACE_TYPE: - ret = AddAccessDeniedAceEx( - pAcl, - ACL_REVISION_DS, - aceFlags, - accessMask, - sid); - break; - case ACCESS_DENIED_OBJECT_ACE_TYPE: - ret = AddAccessDeniedObjectAce( - pAcl, - ACL_REVISION_DS, - aceFlags, - accessMask, - objectValid ? &object : NULL, - inheritObjectValid ? &inheritObject : NULL, - sid); - break; - case SYSTEM_AUDIT_ACE_TYPE: - ret = AddAuditAccessAceEx( - pAcl, - ACL_REVISION_DS, - aceFlags, - accessMask, - sid, - FALSE, - FALSE); - break; - case SYSTEM_AUDIT_OBJECT_ACE_TYPE: - ret = AddAuditAccessObjectAce( - pAcl, - ACL_REVISION_DS, - aceFlags, - accessMask, - objectValid ? &object : NULL, - inheritObjectValid ? &inheritObject : NULL, - sid, - FALSE, - FALSE); - break; - case SYSTEM_ALARM_ACE_TYPE: - case SYSTEM_ALARM_OBJECT_ACE_TYPE: - default: - { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - ret = FALSE; - } - } - LocalFree(sid); - return ret; -} - /* Exported functions */ /* @@ -1122,573 +758,6 @@ } } -/****************************************************************************** - * ConvertStringSecurityDescriptorToSecurityDescriptorW [ADVAPI32.@] - * @implemented - */ -BOOL WINAPI -ConvertStringSecurityDescriptorToSecurityDescriptorW( - IN LPCWSTR StringSecurityDescriptor, - IN DWORD StringSDRevision, - OUT PSECURITY_DESCRIPTOR* SecurityDescriptor, - OUT PULONG SecurityDescriptorSize) -{ - PSECURITY_DESCRIPTOR sd = NULL; - BOOL ret = FALSE; - - if (!StringSecurityDescriptor || !SecurityDescriptor) - SetLastError(ERROR_INVALID_PARAMETER); - else if (StringSDRevision != SDDL_REVISION_1) - SetLastError(ERROR_INVALID_PARAMETER); - else - { - LPCWSTR ptr = StringSecurityDescriptor; - DWORD numberOfAces = 0; - DWORD relativeSdSize; - SIZE_T MaxAclSize; - PSECURITY_DESCRIPTOR relativeSd = NULL; - PSID pSid; - PACL pAcl; - BOOL present, dummy; - /* An easy way to know how much space we need for an ACL is to count - * the number of ACEs and say that we have 1 SID by ACE - */ - ptr = wcschr(StringSecurityDescriptor, SDDL_ACE_BEGINC); - while (ptr != NULL) - { - numberOfAces++; - ptr = wcschr(ptr + 1, SDDL_ACE_BEGINC); - } - MaxAclSize = sizeof(ACL) + numberOfAces * - (sizeof(ACCESS_ALLOWED_OBJECT_ACE) + SECURITY_MAX_SID_SIZE); - - sd = (SECURITY_DESCRIPTOR*)LocalAlloc(0, sizeof(SECURITY_DESCRIPTOR)); - if (!sd) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); - if (!ret) - goto cleanup; - - /* Now, really parse the string */ - ptr = StringSecurityDescriptor; - while (*ptr) - { - if (ptr[1] != SDDL_DELIMINATORC) - { - SetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; - goto cleanup; - } - ptr += 2; - switch (ptr[-2]) - { - case 'O': - case 'G': - { - PSID pSid; - SIZE_T Length; - - ret = ParseSidString(ptr, &pSid, &Length); - if (!ret) - goto cleanup; - if (ptr[-2] == 'O') - ret = SetSecurityDescriptorOwner(sd, pSid, FALSE); - else - ret = SetSecurityDescriptorGroup(sd, pSid, FALSE); - if (!ret) - { - LocalFree(pSid); - goto cleanup; - } - ptr += Length; - break; - } - case 'D': - case 'S': - { - DWORD aclFlags; - SIZE_T Length; - BOOL isDacl = (ptr[-2] == 'D'); - - if (isDacl) - ret = ParseFlagsString(ptr, DaclFlagTable, SDDL_ACE_BEGINC, &aclFlags, &Length); - else - ret = ParseFlagsString(ptr, SaclFlagTable, SDDL_ACE_BEGINC, &aclFlags, &Length); - if (!ret) - goto cleanup; - pAcl = (PACL)LocalAlloc(0, MaxAclSize); - if (!pAcl) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - ret = FALSE; - goto cleanup; - } - if (!InitializeAcl(pAcl, (DWORD)MaxAclSize, ACL_REVISION_DS)) - { - LocalFree(pAcl); - goto cleanup; - } - if (aclFlags != 0) - { - ret = SetSecurityDescriptorControl( - sd, - (SECURITY_DESCRIPTOR_CONTROL)aclFlags, - (SECURITY_DESCRIPTOR_CONTROL)aclFlags); - if (!ret) - { - LocalFree(pAcl); - goto cleanup; - } - } - ptr += Length; - while (*ptr == SDDL_ACE_BEGINC) - { - ret = ParseAceString(ptr, pAcl, &Length); - if (!ret) - { - LocalFree(pAcl); - goto cleanup; - } - ptr += Length; - } - if (isDacl) - ret = SetSecurityDescriptorDacl(sd, TRUE, pAcl, FALSE); - else - ret = SetSecurityDescriptorSacl(sd, TRUE, pAcl, FALSE); - if (!ret) - { - LocalFree(pAcl); - goto cleanup; - } - break; - } - default: - { - SetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; - goto cleanup; - } - } - } - - relativeSdSize = 0; - while (TRUE) - { - if (relativeSd) - LocalFree(relativeSd); - relativeSd = LocalAlloc(0, relativeSdSize); - if (!relativeSd) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - ret = MakeSelfRelativeSD(sd, relativeSd, &relativeSdSize); - if (ret || GetLastError() != ERROR_INSUFFICIENT_BUFFER) - break; - } - if (SecurityDescriptorSize) - *SecurityDescriptorSize = relativeSdSize; - *SecurityDescriptor = relativeSd; - -cleanup: - if (GetSecurityDescriptorOwner(sd, &pSid, &dummy)) - LocalFree(pSid); - if (GetSecurityDescriptorGroup(sd, &pSid, &dummy)) - LocalFree(pSid); - if (GetSecurityDescriptorDacl(sd, &present, &pAcl, &dummy) && present) - LocalFree(pAcl); - if (GetSecurityDescriptorSacl(sd, &present, &pAcl, &dummy) && present) - LocalFree(pAcl); - LocalFree(sd); - return ret; - } - return FALSE; -} - -/* Winehq cvs 20050916 */ -/****************************************************************************** - * ConvertStringSecurityDescriptorToSecurityDescriptorA [ADVAPI32.@] - * @implemented - */ -BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorA( - LPCSTR StringSecurityDescriptor, - DWORD StringSDRevision, - PSECURITY_DESCRIPTOR* SecurityDescriptor, - PULONG SecurityDescriptorSize) -{ - UINT len; - BOOL ret = FALSE; - LPWSTR StringSecurityDescriptorW; - - len = MultiByteToWideChar(CP_ACP, 0, StringSecurityDescriptor, -1, NULL, 0); - StringSecurityDescriptorW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - - if (StringSecurityDescriptorW) - { - MultiByteToWideChar(CP_ACP, 0, StringSecurityDescriptor, -1, StringSecurityDescriptorW, len); - - ret = ConvertStringSecurityDescriptorToSecurityDescriptorW(StringSecurityDescriptorW, - StringSDRevision, SecurityDescriptor, - SecurityDescriptorSize); - HeapFree(GetProcessHeap(), 0, StringSecurityDescriptorW); - } - - return ret; -} - -/* - * @implemented - */ -BOOL WINAPI -EqualPrefixSid(PSID pSid1, - PSID pSid2) -{ - return RtlEqualPrefixSid (pSid1, pSid2); -} - - -/* - * @implemented - */ -BOOL WINAPI -EqualSid(PSID pSid1, - PSID pSid2) -{ - return RtlEqualSid (pSid1, pSid2); -} - - -/* - * @implemented - * - * RETURNS - * Docs says this function does NOT return a value - * even thou it's defined to return a PVOID... - */ -PVOID WINAPI -FreeSid(PSID pSid) -{ - return RtlFreeSid(pSid); -} - - -/* - * @implemented - */ -DWORD WINAPI -GetLengthSid(PSID pSid) -{ - return (DWORD)RtlLengthSid(pSid); -} - - -/* - * @implemented - */ -PSID_IDENTIFIER_AUTHORITY WINAPI -GetSidIdentifierAuthority(PSID pSid) -{ - return RtlIdentifierAuthoritySid(pSid); -} - - -/* - * @implemented - */ -DWORD WINAPI -GetSidLengthRequired(UCHAR nSubAuthorityCount) -{ - return (DWORD)RtlLengthRequiredSid(nSubAuthorityCount); -} - - -/* - * @implemented - */ -PDWORD WINAPI -GetSidSubAuthority(PSID pSid, - DWORD nSubAuthority) -{ - return (PDWORD)RtlSubAuthoritySid(pSid, nSubAuthority); -} - - -/* - * @implemented - */ -PUCHAR WINAPI -GetSidSubAuthorityCount(PSID pSid) -{ - return RtlSubAuthorityCountSid(pSid); -} - - -/* - * @implemented - */ -BOOL WINAPI -InitializeSid(PSID Sid, - PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority, - BYTE nSubAuthorityCount) -{ - NTSTATUS Status; - - Status = RtlInitializeSid(Sid, - pIdentifierAuthority, - nSubAuthorityCount); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI -IsValidSid(PSID pSid) -{ - return (BOOL)RtlValidSid(pSid); -} - - -/* - * @implemented - */ -BOOL WINAPI -ConvertSidToStringSidW(PSID Sid, - LPWSTR *StringSid) -{ - NTSTATUS Status; - UNICODE_STRING UnicodeString; - WCHAR FixedBuffer[64]; - - if (!RtlValidSid(Sid)) - { - SetLastError(ERROR_INVALID_SID); - return FALSE; - } - - UnicodeString.Length = 0; - UnicodeString.MaximumLength = sizeof(FixedBuffer); - UnicodeString.Buffer = FixedBuffer; - Status = RtlConvertSidToUnicodeString(&UnicodeString, Sid, FALSE); - if (STATUS_BUFFER_TOO_SMALL == Status) - { - Status = RtlConvertSidToUnicodeString(&UnicodeString, Sid, TRUE); - } - - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - *StringSid = LocalAlloc(LMEM_FIXED, UnicodeString.Length + sizeof(WCHAR)); - if (NULL == *StringSid) - { - if (UnicodeString.Buffer != FixedBuffer) - { - RtlFreeUnicodeString(&UnicodeString); - } - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - MoveMemory(*StringSid, UnicodeString.Buffer, UnicodeString.Length); - ZeroMemory((PCHAR) *StringSid + UnicodeString.Length, sizeof(WCHAR)); - if (UnicodeString.Buffer != FixedBuffer) - { - RtlFreeUnicodeString(&UnicodeString); - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI -ConvertSidToStringSidA(PSID Sid, - LPSTR *StringSid) -{ - LPWSTR StringSidW; - int Len; - - if (!ConvertSidToStringSidW(Sid, &StringSidW)) - { - return FALSE; - } - - Len = WideCharToMultiByte(CP_ACP, 0, StringSidW, -1, NULL, 0, NULL, NULL); - if (Len <= 0) - { - LocalFree(StringSidW); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - *StringSid = LocalAlloc(LMEM_FIXED, Len); - if (NULL == *StringSid) - { - LocalFree(StringSidW); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - if (!WideCharToMultiByte(CP_ACP, 0, StringSidW, -1, *StringSid, Len, NULL, NULL)) - { - LocalFree(StringSid); - LocalFree(StringSidW); - return FALSE; - } - - LocalFree(StringSidW); - - return TRUE; -} - - -/* - * @unimplemented - */ -BOOL WINAPI -EqualDomainSid(IN PSID pSid1, - IN PSID pSid2, - OUT BOOL* pfEqual) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL WINAPI -GetWindowsAccountDomainSid(IN PSID pSid, - OUT PSID ppDomainSid, - IN OUT DWORD* cbSid) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL WINAPI -CreateWellKnownSid(IN WELL_KNOWN_SID_TYPE WellKnownSidType, - IN PSID DomainSid OPTIONAL, - OUT PSID pSid, - IN OUT DWORD* cbSid) -{ - unsigned int i; - TRACE("(%d, %s, %p, %p)\n", WellKnownSidType, debugstr_sid(DomainSid), pSid, cbSid); - - if (cbSid == NULL || pSid == NULL || (DomainSid && !IsValidSid(DomainSid))) { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) { - if (WellKnownSids[i].Type == WellKnownSidType) { - DWORD length = GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); - - if (*cbSid < length) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - CopyMemory(pSid, &WellKnownSids[i].Sid.Revision, length); - *cbSid = length; - return TRUE; - } - } - - if (DomainSid == NULL || *GetSidSubAuthorityCount(DomainSid) == SID_MAX_SUB_AUTHORITIES) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - for (i = 0; i < sizeof(WellKnownRids)/sizeof(WellKnownRids[0]); i++) - if (WellKnownRids[i].Type == WellKnownSidType) { - UCHAR domain_subauth = *GetSidSubAuthorityCount(DomainSid); - DWORD domain_sid_length = GetSidLengthRequired(domain_subauth); - DWORD output_sid_length = GetSidLengthRequired(domain_subauth + 1); - - if (*cbSid < output_sid_length) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - CopyMemory(pSid, DomainSid, domain_sid_length); - (*GetSidSubAuthorityCount(pSid))++; - (*GetSidSubAuthority(pSid, domain_subauth)) = WellKnownRids[i].Rid; - *cbSid = output_sid_length; - return TRUE; - } - - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL WINAPI -IsWellKnownSid(IN PSID pSid, - IN WELL_KNOWN_SID_TYPE WellKnownSidType) -{ - unsigned int i; - TRACE("(%s, %d)\n", debugstr_sid(pSid), WellKnownSidType); - - for (i = 0; i < sizeof(WellKnownSids) / sizeof(WellKnownSids[0]); i++) - { - if (WellKnownSids[i].Type == WellKnownSidType) - { - if (EqualSid(pSid, (PSID)((ULONG_PTR)&WellKnownSids[i].Sid.Revision))) - return TRUE; - } - } - - return FALSE; -} - - -/* - * @implemented - */ -BOOL WINAPI -ConvertStringSidToSidA(IN LPCSTR StringSid, - OUT PSID* sid) -{ - BOOL bRetVal = FALSE; - - if (!StringSid || !sid) - SetLastError(ERROR_INVALID_PARAMETER); - else - { - UINT len = MultiByteToWideChar(CP_ACP, 0, StringSid, -1, NULL, 0); - LPWSTR wStringSid = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, StringSid, - 1, wStringSid, len); - bRetVal = ConvertStringSidToSidW(wStringSid, sid); - HeapFree(GetProcessHeap(), 0, wStringSid); - } - return bRetVal; -} - /****************************************************************************** * ComputeStringSidSize @@ -1719,6 +788,976 @@ return GetSidLengthRequired(0); } + + +/****************************************************************************** + * ParseStringSidToSid + */ +static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes) +{ + BOOL bret = FALSE; + SID* pisid=pSid; + + TRACE("%s, %p, %p\n", debugstr_w(StringSid), pSid, cBytes); + if (!StringSid) + { + SetLastError(ERROR_INVALID_PARAMETER); + TRACE("StringSid is NULL, returning FALSE\n"); + return FALSE; + } + + *cBytes = ComputeStringSidSize(StringSid); + if (!pisid) /* Simply compute the size */ + { + TRACE("only size requested, returning TRUE\n"); + return TRUE; + } + + if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I-S-S */ + { + DWORD i = 0, identAuth; + DWORD csubauth = ((*cBytes - GetSidLengthRequired(0)) / sizeof(DWORD)); + + StringSid += 2; /* Advance to Revision */ + pisid->Revision = atoiW(StringSid); + + if (pisid->Revision != SDDL_REVISION) + { + TRACE("Revision %d is unknown\n", pisid->Revision); + goto lend; /* ERROR_INVALID_SID */ + } + if (csubauth == 0) + { + TRACE("SubAuthorityCount is 0\n"); + goto lend; /* ERROR_INVALID_SID */ + } + + pisid->SubAuthorityCount = csubauth; + + /* Advance to identifier authority */ + while (*StringSid && *StringSid != '-') + StringSid++; + if (*StringSid == '-') + StringSid++; + + /* MS' implementation can't handle values greater than 2^32 - 1, so + * we don't either; assume most significant bytes are always 0 + */ + pisid->IdentifierAuthority.Value[0] = 0; + pisid->IdentifierAuthority.Value[1] = 0; + identAuth = atoiW(StringSid); + pisid->IdentifierAuthority.Value[5] = identAuth & 0xff; + pisid->IdentifierAuthority.Value[4] = (identAuth & 0xff00) >> 8; + pisid->IdentifierAuthority.Value[3] = (identAuth & 0xff0000) >> 16; + pisid->IdentifierAuthority.Value[2] = (identAuth & 0xff000000) >> 24; + + /* Advance to first sub authority */ + while (*StringSid && *StringSid != '-') + StringSid++; + if (*StringSid == '-') + StringSid++; + + while (*StringSid) + { + pisid->SubAuthority[i++] = atoiW(StringSid); + + while (*StringSid && *StringSid != '-') + StringSid++; + if (*StringSid == '-') + StringSid++; + } + + if (i != pisid->SubAuthorityCount) + goto lend; /* ERROR_INVALID_SID */ + + bret = TRUE; + } + else /* String constant format - Only available in winxp and above */ + { + unsigned int i; + pisid->Revision = SDDL_REVISION; + + for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) + if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) + { + DWORD j; + pisid->SubAuthorityCount = WellKnownSids[i].Sid.SubAuthorityCount; + pisid->IdentifierAuthority = WellKnownSids[i].Sid.IdentifierAuthority; + for (j = 0; j < WellKnownSids[i].Sid.SubAuthorityCount; j++) + pisid->SubAuthority[j] = WellKnownSids[i].Sid.SubAuthority[j]; + bret = TRUE; + } + + if (!bret) + FIXME("String constant not supported: %s\n", debugstr_wn(StringSid, 2)); + } + +lend: + if (!bret) + SetLastError(ERROR_INVALID_SID); + + TRACE("returning %s\n", bret ? "TRUE" : "FALSE"); + return bret; +} + + +/****************************************************************************** + * ParseAclStringFlags + */ +static DWORD ParseAclStringFlags(LPCWSTR* StringAcl) +{ + DWORD flags = 0; + LPCWSTR szAcl = *StringAcl; + + while (*szAcl != '(') + { + if (*szAcl == 'P') + { + flags |= SE_DACL_PROTECTED; + } + else if (*szAcl == 'A') + { + szAcl++; + if (*szAcl == 'R') + flags |= SE_DACL_AUTO_INHERIT_REQ; + else if (*szAcl == 'I') + flags |= SE_DACL_AUTO_INHERITED; + } + szAcl++; + } + + *StringAcl = szAcl; + return flags; +} + + +/****************************************************************************** + * ParseAceStringType + */ +static const ACEFLAG AceType[] = +{ + { SDDL_ALARM, SYSTEM_ALARM_ACE_TYPE }, + { SDDL_AUDIT, SYSTEM_AUDIT_ACE_TYPE }, + { SDDL_ACCESS_ALLOWED, ACCESS_ALLOWED_ACE_TYPE }, + { SDDL_ACCESS_DENIED, ACCESS_DENIED_ACE_TYPE }, + /* + { SDDL_OBJECT_ACCESS_ALLOWED, ACCESS_ALLOWED_OBJECT_ACE_TYPE }, + { SDDL_OBJECT_ACCESS_DENIED, ACCESS_DENIED_OBJECT_ACE_TYPE }, + { SDDL_OBJECT_ALARM, SYSTEM_ALARM_OBJECT_ACE_TYPE }, + { SDDL_OBJECT_AUDIT, SYSTEM_AUDIT_OBJECT_ACE_TYPE }, + */ + { NULL, 0 }, +}; + +static BYTE ParseAceStringType(LPCWSTR* StringAcl) +{ + UINT len = 0; + LPCWSTR szAcl = *StringAcl; + const ACEFLAG *lpaf = AceType; + + while (lpaf->wstr && + (len = strlenW(lpaf->wstr)) && + strncmpW(lpaf->wstr, szAcl, len)) + lpaf++; + + if (!lpaf->wstr) + return 0; + + *StringAcl += len; + return lpaf->value; +} + + +/****************************************************************************** + * ParseAceStringFlags + */ +static const ACEFLAG AceFlags[] = +{ + { SDDL_CONTAINER_INHERIT, CONTAINER_INHERIT_ACE }, + { SDDL_AUDIT_FAILURE, FAILED_ACCESS_ACE_FLAG }, + { SDDL_INHERITED, INHERITED_ACE }, + { SDDL_INHERIT_ONLY, INHERIT_ONLY_ACE }, + { SDDL_NO_PROPAGATE, NO_PROPAGATE_INHERIT_ACE }, + { SDDL_OBJECT_INHERIT, OBJECT_INHERIT_ACE }, + { SDDL_AUDIT_SUCCESS, SUCCESSFUL_ACCESS_ACE_FLAG }, + { NULL, 0 }, +}; + +static BYTE ParseAceStringFlags(LPCWSTR* StringAcl) +{ + UINT len = 0; + BYTE flags = 0; + LPCWSTR szAcl = *StringAcl; + + while (*szAcl != ';') + { + const ACEFLAG *lpaf = AceFlags; + + while (lpaf->wstr && + (len = strlenW(lpaf->wstr)) && + strncmpW(lpaf->wstr, szAcl, len)) + lpaf++; + + if (!lpaf->wstr) + return 0; + + flags |= lpaf->value; + szAcl += len; + } + + *StringAcl = szAcl; + return flags; +} + + +/****************************************************************************** + * ParseAceStringRights + */ +static DWORD ParseAceStringRights(LPCWSTR* StringAcl) +{ + UINT len = 0; + DWORD rights = 0; + LPCWSTR szAcl = *StringAcl; + + if ((*szAcl == '0') && (*(szAcl + 1) == 'x')) + { + LPCWSTR p = szAcl; + + while (*p && *p != ';') + p++; + + if (p - szAcl <= 10 /* 8 hex digits + "0x" */ ) + { + rights = strtoulW(szAcl, NULL, 16); + szAcl = p; + } + else + WARN("Invalid rights string format: %s\n", debugstr_wn(szAcl, p - szAcl)); + } + else + { + while (*szAcl != ';') + { + const ACEFLAG *lpaf = AceRights; + + while (lpaf->wstr && + (len = strlenW(lpaf->wstr)) && + strncmpW(lpaf->wstr, szAcl, len)) + { + lpaf++; + } + + if (!lpaf->wstr) + return 0; + + rights |= lpaf->value; + szAcl += len; + } + } + + *StringAcl = szAcl; + return rights; +} + + +/****************************************************************************** + * ParseStringAclToAcl + * + * dacl_flags(string_ace1)(string_ace2)... (string_acen) + */ +static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, + PACL pAcl, LPDWORD cBytes) +{ + DWORD val; + DWORD sidlen; + DWORD length = sizeof(ACL); + DWORD acesize = 0; + DWORD acecount = 0; + PACCESS_ALLOWED_ACE pAce = NULL; /* pointer to current ACE */ + + TRACE("%s\n", debugstr_w(StringAcl)); + + if (!StringAcl) + return FALSE; + + if (pAcl) /* pAce is only useful if we're setting values */ + pAce = (PACCESS_ALLOWED_ACE) (pAcl + 1); + + /* Parse ACL flags */ + *lpdwFlags = ParseAclStringFlags(&StringAcl); + + /* Parse ACE */ + while (*StringAcl == '(') + { + StringAcl++; + + /* Parse ACE type */ + val = ParseAceStringType(&StringAcl); + if (pAce) + pAce->Header.AceType = (BYTE) val; + if (*StringAcl != ';') + goto lerr; + StringAcl++; + + /* Parse ACE flags */ + val = ParseAceStringFlags(&StringAcl); + if (pAce) + pAce->Header.AceFlags = (BYTE) val; + if (*StringAcl != ';') + goto lerr; + StringAcl++; + + /* Parse ACE rights */ + val = ParseAceStringRights(&StringAcl); + if (pAce) + pAce->Mask = val; + if (*StringAcl != ';') + goto lerr; + StringAcl++; + + /* Parse ACE object guid */ + if (*StringAcl != ';') + { + FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); + goto lerr; + } + StringAcl++; + + /* Parse ACE inherit object guid */ + if (*StringAcl != ';') + { + FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); + goto lerr; + } + StringAcl++; + + /* Parse ACE account sid */ + if (ParseStringSidToSid(StringAcl, pAce ? &pAce->SidStart : NULL, &sidlen)) + { + while (*StringAcl && *StringAcl != ')') + StringAcl++; + } + + if (*StringAcl != ')') + goto lerr; + StringAcl++; + + acesize = sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + sidlen; + length += acesize; + if (pAce) + { + pAce->Header.AceSize = acesize; + pAce = (PACCESS_ALLOWED_ACE)((LPBYTE)pAce + acesize); + } + acecount++; + } + + *cBytes = length; + + if (length > 0xffff) + { + ERR("ACL too large\n"); + goto lerr; + } + + if (pAcl) + { + pAcl->AclRevision = ACL_REVISION; + pAcl->Sbz1 = 0; + pAcl->AclSize = length; + pAcl->AceCount = acecount++; + pAcl->Sbz2 = 0; + } + return TRUE; + +lerr: + SetLastError(ERROR_INVALID_ACL); + WARN("Invalid ACE string format\n"); + return FALSE; +} + + +/****************************************************************************** + * ParseStringSecurityDescriptorToSecurityDescriptor + */ +static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( + LPCWSTR StringSecurityDescriptor, + SECURITY_DESCRIPTOR* SecurityDescriptor, + LPDWORD cBytes) +{ + BOOL bret = FALSE; + WCHAR toktype; + WCHAR tok[MAX_PATH]; + LPCWSTR lptoken; + LPBYTE lpNext = NULL; + DWORD len; + + *cBytes = sizeof(SECURITY_DESCRIPTOR); + + if (SecurityDescriptor) + lpNext = ((LPBYTE) SecurityDescriptor) + sizeof(SECURITY_DESCRIPTOR); + + while (*StringSecurityDescriptor) + { + toktype = *StringSecurityDescriptor; + + /* Expect char identifier followed by ':' */ + StringSecurityDescriptor++; + if (*StringSecurityDescriptor != ':') + { + SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + StringSecurityDescriptor++; + + /* Extract token */ + lptoken = StringSecurityDescriptor; + while (*lptoken && *lptoken != ':') + lptoken++; + + if (*lptoken) + lptoken--; + + len = lptoken - StringSecurityDescriptor; + memcpy( tok, StringSecurityDescriptor, len * sizeof(WCHAR) ); + tok[len] = 0; + + switch (toktype) + { + case 'O': + { + DWORD bytes; + + if (!ParseStringSidToSid(tok, lpNext, &bytes)) + goto lend; + + if (SecurityDescriptor) + { + SecurityDescriptor->Owner = (PSID)(lpNext - (LPBYTE)SecurityDescriptor); + lpNext += bytes; /* Advance to next token */ + } + + *cBytes += bytes; + + break; + } + + case 'G': + { + DWORD bytes; + + if (!ParseStringSidToSid(tok, lpNext, &bytes)) + goto lend; + + if (SecurityDescriptor) + { + SecurityDescriptor->Group = (PSID)(lpNext - (LPBYTE)SecurityDescriptor); + lpNext += bytes; /* Advance to next token */ + } + + *cBytes += bytes; + + break; + } + + case 'D': + { + DWORD flags; + DWORD bytes; + + if (!ParseStringAclToAcl(tok, &flags, (PACL)lpNext, &bytes)) + goto lend; + + if (SecurityDescriptor) + { + SecurityDescriptor->Control |= SE_DACL_PRESENT | flags; + SecurityDescriptor->Dacl = (PACL)(lpNext - (LPBYTE)SecurityDescriptor); + lpNext += bytes; /* Advance to next token */ + } + + *cBytes += bytes; + + break; + } + + case 'S': + { + DWORD flags; + DWORD bytes; + + if (!ParseStringAclToAcl(tok, &flags, (PACL)lpNext, &bytes)) + goto lend; + + if (SecurityDescriptor) + { + SecurityDescriptor->Control |= SE_SACL_PRESENT | flags; + SecurityDescriptor->Sacl = (PACL)(lpNext - (LPBYTE)SecurityDescriptor); + lpNext += bytes; /* Advance to next token */ + } + + *cBytes += bytes; + + break; + } + + default: + FIXME("Unknown token\n"); + SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + + StringSecurityDescriptor = lptoken; + } + + bret = TRUE; + +lend: + return bret; +} + + +/****************************************************************************** + * ConvertStringSecurityDescriptorToSecurityDescriptorW [ADVAPI32.@] + * @implemented + */ +BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorW( + LPCWSTR StringSecurityDescriptor, + DWORD StringSDRevision, + PSECURITY_DESCRIPTOR* SecurityDescriptor, + PULONG SecurityDescriptorSize) +{ + DWORD cBytes; + SECURITY_DESCRIPTOR* psd; + BOOL bret = FALSE; + + TRACE("%s\n", debugstr_w(StringSecurityDescriptor)); + + if (GetVersion() & 0x80000000) + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + goto lend; + } + else if (!StringSecurityDescriptor || !SecurityDescriptor) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + else if (StringSDRevision != SID_REVISION) + { + SetLastError(ERROR_UNKNOWN_REVISION); + goto lend; + } + + /* Compute security descriptor length */ + if (!ParseStringSecurityDescriptorToSecurityDescriptor(StringSecurityDescriptor, + NULL, &cBytes)) + goto lend; + + psd = *SecurityDescriptor = LocalAlloc(GMEM_ZEROINIT, cBytes); + if (!psd) goto lend; + + psd->Revision = SID_REVISION; + psd->Control |= SE_SELF_RELATIVE; + + if (!ParseStringSecurityDescriptorToSecurityDescriptor(StringSecurityDescriptor, + psd, &cBytes)) + { + LocalFree(psd); + goto lend; + } + + if (SecurityDescriptorSize) + *SecurityDescriptorSize = cBytes; + + bret = TRUE; + +lend: + TRACE(" ret=%d\n", bret); + return bret; +} + + +/* Winehq cvs 20050916 */ +/****************************************************************************** + * ConvertStringSecurityDescriptorToSecurityDescriptorA [ADVAPI32.@] + * @implemented + */ +BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorA( + LPCSTR StringSecurityDescriptor, + DWORD StringSDRevision, + PSECURITY_DESCRIPTOR* SecurityDescriptor, + PULONG SecurityDescriptorSize) +{ + UINT len; + BOOL ret = FALSE; + LPWSTR StringSecurityDescriptorW; + + len = MultiByteToWideChar(CP_ACP, 0, StringSecurityDescriptor, -1, NULL, 0); + StringSecurityDescriptorW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + + if (StringSecurityDescriptorW) + { + MultiByteToWideChar(CP_ACP, 0, StringSecurityDescriptor, -1, StringSecurityDescriptorW, len); + + ret = ConvertStringSecurityDescriptorToSecurityDescriptorW(StringSecurityDescriptorW, + StringSDRevision, SecurityDescriptor, + SecurityDescriptorSize); + HeapFree(GetProcessHeap(), 0, StringSecurityDescriptorW); + } + + return ret; +} + +/* + * @implemented + */ +BOOL WINAPI +EqualPrefixSid(PSID pSid1, + PSID pSid2) +{ + return RtlEqualPrefixSid (pSid1, pSid2); +} + + +/* + * @implemented + */ +BOOL WINAPI +EqualSid(PSID pSid1, + PSID pSid2) +{ + return RtlEqualSid (pSid1, pSid2); +} + + +/* + * @implemented + * + * RETURNS + * Docs says this function does NOT return a value + * even thou it's defined to return a PVOID... + */ +PVOID WINAPI +FreeSid(PSID pSid) +{ + return RtlFreeSid(pSid); +} + + +/* + * @implemented + */ +DWORD WINAPI +GetLengthSid(PSID pSid) +{ + return (DWORD)RtlLengthSid(pSid); +} + + +/* + * @implemented + */ +PSID_IDENTIFIER_AUTHORITY WINAPI +GetSidIdentifierAuthority(PSID pSid) +{ + return RtlIdentifierAuthoritySid(pSid); +} + + +/* + * @implemented + */ +DWORD WINAPI +GetSidLengthRequired(UCHAR nSubAuthorityCount) +{ + return (DWORD)RtlLengthRequiredSid(nSubAuthorityCount); +} + + +/* + * @implemented + */ +PDWORD WINAPI +GetSidSubAuthority(PSID pSid, + DWORD nSubAuthority) +{ + return (PDWORD)RtlSubAuthoritySid(pSid, nSubAuthority); +} + + +/* + * @implemented + */ +PUCHAR WINAPI +GetSidSubAuthorityCount(PSID pSid) +{ + return RtlSubAuthorityCountSid(pSid); +} + + +/* + * @implemented + */ +BOOL WINAPI +InitializeSid(PSID Sid, + PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority, + BYTE nSubAuthorityCount) +{ + NTSTATUS Status; + + Status = RtlInitializeSid(Sid, + pIdentifierAuthority, + nSubAuthorityCount); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + + +/* + * @implemented + */ +BOOL WINAPI +IsValidSid(PSID pSid) +{ + return (BOOL)RtlValidSid(pSid); +} + + +/* + * @implemented + */ +BOOL WINAPI +ConvertSidToStringSidW(PSID Sid, + LPWSTR *StringSid) +{ + NTSTATUS Status; + UNICODE_STRING UnicodeString; + WCHAR FixedBuffer[64]; + + if (!RtlValidSid(Sid)) + { + SetLastError(ERROR_INVALID_SID); + return FALSE; + } + + UnicodeString.Length = 0; + UnicodeString.MaximumLength = sizeof(FixedBuffer); + UnicodeString.Buffer = FixedBuffer; + Status = RtlConvertSidToUnicodeString(&UnicodeString, Sid, FALSE); + if (STATUS_BUFFER_TOO_SMALL == Status) + { + Status = RtlConvertSidToUnicodeString(&UnicodeString, Sid, TRUE); + } + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + *StringSid = LocalAlloc(LMEM_FIXED, UnicodeString.Length + sizeof(WCHAR)); + if (NULL == *StringSid) + { + if (UnicodeString.Buffer != FixedBuffer) + { + RtlFreeUnicodeString(&UnicodeString); + } + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + MoveMemory(*StringSid, UnicodeString.Buffer, UnicodeString.Length); + ZeroMemory((PCHAR) *StringSid + UnicodeString.Length, sizeof(WCHAR)); + if (UnicodeString.Buffer != FixedBuffer) + { + RtlFreeUnicodeString(&UnicodeString); + } + + return TRUE; +} + + +/* + * @implemented + */ +BOOL WINAPI +ConvertSidToStringSidA(PSID Sid, + LPSTR *StringSid) +{ + LPWSTR StringSidW; + int Len; + + if (!ConvertSidToStringSidW(Sid, &StringSidW)) + { + return FALSE; + } + + Len = WideCharToMultiByte(CP_ACP, 0, StringSidW, -1, NULL, 0, NULL, NULL); + if (Len <= 0) + { + LocalFree(StringSidW); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + *StringSid = LocalAlloc(LMEM_FIXED, Len); + if (NULL == *StringSid) + { + LocalFree(StringSidW); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (!WideCharToMultiByte(CP_ACP, 0, StringSidW, -1, *StringSid, Len, NULL, NULL)) + { + LocalFree(StringSid); + LocalFree(StringSidW); + return FALSE; + } + + LocalFree(StringSidW); + + return TRUE; +} + + +/* + * @unimplemented + */ +BOOL WINAPI +EqualDomainSid(IN PSID pSid1, + IN PSID pSid2, + OUT BOOL* pfEqual) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL WINAPI +GetWindowsAccountDomainSid(IN PSID pSid, + OUT PSID ppDomainSid, + IN OUT DWORD* cbSid) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL WINAPI +CreateWellKnownSid(IN WELL_KNOWN_SID_TYPE WellKnownSidType, + IN PSID DomainSid OPTIONAL, + OUT PSID pSid, + IN OUT DWORD* cbSid) +{ + unsigned int i; + TRACE("(%d, %s, %p, %p)\n", WellKnownSidType, debugstr_sid(DomainSid), pSid, cbSid); + + if (cbSid == NULL || pSid == NULL || (DomainSid && !IsValidSid(DomainSid))) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) { + if (WellKnownSids[i].Type == WellKnownSidType) { + DWORD length = GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); + + if (*cbSid < length) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + CopyMemory(pSid, &WellKnownSids[i].Sid.Revision, length); + *cbSid = length; + return TRUE; + } + } + + if (DomainSid == NULL || *GetSidSubAuthorityCount(DomainSid) == SID_MAX_SUB_AUTHORITIES) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + for (i = 0; i < sizeof(WellKnownRids)/sizeof(WellKnownRids[0]); i++) + if (WellKnownRids[i].Type == WellKnownSidType) { + UCHAR domain_subauth = *GetSidSubAuthorityCount(DomainSid); + DWORD domain_sid_length = GetSidLengthRequired(domain_subauth); + DWORD output_sid_length = GetSidLengthRequired(domain_subauth + 1); + + if (*cbSid < output_sid_length) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + CopyMemory(pSid, DomainSid, domain_sid_length); + (*GetSidSubAuthorityCount(pSid))++; + (*GetSidSubAuthority(pSid, domain_subauth)) = WellKnownRids[i].Rid; + *cbSid = output_sid_length; + return TRUE; + } + + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL WINAPI +IsWellKnownSid(IN PSID pSid, + IN WELL_KNOWN_SID_TYPE WellKnownSidType) +{ + unsigned int i; + TRACE("(%s, %d)\n", debugstr_sid(pSid), WellKnownSidType); + + for (i = 0; i < sizeof(WellKnownSids) / sizeof(WellKnownSids[0]); i++) + { + if (WellKnownSids[i].Type == WellKnownSidType) + { + if (EqualSid(pSid, (PSID)((ULONG_PTR)&WellKnownSids[i].Sid.Revision))) + return TRUE; + } + } + + return FALSE; +} + + +/* + * @implemented + */ +BOOL WINAPI +ConvertStringSidToSidA(IN LPCSTR StringSid, + OUT PSID* sid) +{ + BOOL bRetVal = FALSE; + + if (!StringSid || !sid) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + UINT len = MultiByteToWideChar(CP_ACP, 0, StringSid, -1, NULL, 0); + LPWSTR wStringSid = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, StringSid, - 1, wStringSid, len); + bRetVal = ConvertStringSidToSidW(wStringSid, sid); + HeapFree(GetProcessHeap(), 0, wStringSid); + } + return bRetVal; +} + static const RECORD SidTable[] = { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Apr 14 19:36:39 2009 @@ -193,6 +193,8 @@ advapi32 - reactos/dll/win32/advapi32/crypt/*.c # ekohl says we're not sharing this + reactos/dll/win32/advapi32/sec/cred.c # Out of Sync + reactos/dll/win32/advapi32/sec/sid.c # Out of Sync gdi32 - reactos/dll/win32/gdi32/objects/linedda.c # Synched at 20090410

1 0

[janderwald] 40500: - Fix a bug in the KSPROPERTY_PIN_DATAINTERSECTION handler - Verify format in the pin creation routine - Only create a pin when there is work to be done - Improve error checking
by janderwald＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: janderwald Date: Tue Apr 14 18:59:51 2009 New Revision: 40500 URL: http://svn.reactos.org/svn/reactos?rev=40500&view=rev Log: - Fix a bug in the KSPROPERTY_PIN_DATAINTERSECTION handler - Verify format in the pin creation routine - Only create a pin when there is work to be done - Improve error checking Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c trunk/reactos/drivers/wdm/audio/sysaudio/control.c trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] Tue Apr 14 18:59:51 2009 @@ -106,7 +106,7 @@ } /* Access parameters */ - MultipleItem = (PKSMULTIPLE_ITEM)(Request + 1); + MultipleItem = (PKSMULTIPLE_ITEM)(Pin + 1); DataRange = (PKSDATARANGE)(MultipleItem + 1); /* Get current stack location */ @@ -115,7 +115,9 @@ for(Index = 0; Index < MultipleItem->Count; Index++) { /* Call miniport's properitary handler */ - Status = SubDevice->lpVtbl->DataRangeIntersection(SubDevice, Pin->PinId, DataRange, (PKSDATARANGE)&Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRanges[0], + ASSERT(Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRangesCount); + ASSERT(Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRanges[0]); + Status = SubDevice->lpVtbl->DataRangeIntersection(SubDevice, Pin->PinId, DataRange, (PKSDATARANGE)Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRanges[0], IoStack->Parameters.DeviceIoControl.OutputBufferLength, Data, &Length); if (Status == STATUS_SUCCESS) Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Tue Apr 14 18:59:51 2009 @@ -16,6 +16,15 @@ const GUID KSDATAFORMAT_TYPE_AUDIO = {0x73647561L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; + +NTSTATUS +ComputeCompatibleFormat( + IN PKSAUDIO_DEVICE_ENTRY Entry, + IN ULONG PinId, + IN PSYSAUDIODEVEXT DeviceExtension, + IN PKSDATAFORMAT_WAVEFORMATEX ClientFormat, + OUT PKSDATAFORMAT_WAVEFORMATEX MixerFormat); + NTSTATUS SetIrpIoStatus( @@ -187,17 +196,14 @@ IN PVOID Context) { NTSTATUS Status; + ULONG NumHandels; + HANDLE RealPinHandle = NULL, VirtualPinHandle = NULL, Filter; + PFILE_OBJECT RealFileObject = NULL, VirtualFileObject = NULL; PSYSAUDIO_CLIENT AudioClient; - HANDLE RealPinHandle, VirtualPinHandle; - HANDLE Filter; - ULONG NumHandels; - PFILE_OBJECT FileObject; PSYSAUDIO_PIN_HANDLE ClientPinHandle; + PKSDATAFORMAT_WAVEFORMATEX OutputFormat = NULL; + PKSPIN_CONNECT MixerPinConnect = NULL; PPIN_WORKER_CONTEXT WorkerContext = (PPIN_WORKER_CONTEXT)Context; - PKSPIN_CONNECT PinConnect = NULL; - PKSDATAFORMAT ClientFormat; - KSP_PIN PinRequest; - ULONG BytesReturned; Filter = WorkerContext->PinConnect->PinToHandle; @@ -210,149 +216,95 @@ ASSERT(WorkerContext->Entry->Pins); ASSERT(WorkerContext->Entry->NumberOfPins > WorkerContext->PinConnect->PinId); - PinConnect = WorkerContext->PinConnect; - ClientFormat = (PKSDATAFORMAT)(PinConnect + 1); - - if (WorkerContext->CreateMixerPin) - { - PinConnect = ExAllocatePool(NonPagedPool, sizeof(KSPIN_CONNECT) + WorkerContext->MixerFormat->DataFormat.FormatSize); - if (!PinConnect) - { - /* no memory */ - SetIrpIoStatus(WorkerContext->Irp, STATUS_NO_MEMORY, 0); - ExFreePool(WorkerContext->DispatchContext); - ExFreePool(WorkerContext->MixerFormat); - return; - } - - RtlMoveMemory(PinConnect, WorkerContext->PinConnect, sizeof(KSPIN_CONNECT)); - RtlMoveMemory((PinConnect + 1), WorkerContext->MixerFormat, WorkerContext->MixerFormat->DataFormat.FormatSize); - - Status = CreateMixerPinAndSetFormat(WorkerContext->DeviceExtension->KMixerHandle, - PinConnect, - (PKSDATAFORMAT)(WorkerContext->PinConnect + 1), - (PKSDATAFORMAT)WorkerContext->MixerFormat, - &WorkerContext->DispatchContext->hMixerPin, - &WorkerContext->DispatchContext->MixerFileObject); - - ExFreePool(WorkerContext->MixerFormat); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create Mixer Pin with %x\n", Status); + /* Let's try to create the audio irp pin */ + Status = KsCreatePin(WorkerContext->Entry->Handle, WorkerContext->PinConnect, GENERIC_READ | GENERIC_WRITE, &RealPinHandle); + + if (!NT_SUCCESS(Status)) + { + /* the audio irp pin didnt accept the input format + * let's compute a compatible format + */ + + MixerPinConnect = ExAllocatePool(NonPagedPool, sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX)); + if (!MixerPinConnect) + { SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); ExFreePool(WorkerContext->DispatchContext); return; } - } - else - { - Status = CreateMixerPinAndSetFormat(WorkerContext->DeviceExtension->KMixerHandle, - WorkerContext->PinConnect, - (PKSDATAFORMAT)(WorkerContext->PinConnect + 1), - (PKSDATAFORMAT)(WorkerContext->PinConnect + 1), + + /* Copy initial connect details */ + RtlMoveMemory(MixerPinConnect, WorkerContext->PinConnect, sizeof(KSPIN_CONNECT)); + + + OutputFormat = (PKSDATAFORMAT_WAVEFORMATEX)(MixerPinConnect + 1); + + Status = ComputeCompatibleFormat(WorkerContext->Entry, WorkerContext->PinConnect->PinId, WorkerContext->DeviceExtension, (PKSDATAFORMAT_WAVEFORMATEX)(WorkerContext->PinConnect + 1), OutputFormat); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ComputeCompatibleFormat failed with %x\n", Status); + SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); + ExFreePool(WorkerContext->DispatchContext); + ExFreePool(MixerPinConnect); + return; + } + + /* Retry with Mixer format */ + Status = KsCreatePin(WorkerContext->Entry->Handle, MixerPinConnect, GENERIC_READ | GENERIC_WRITE, &RealPinHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("KsCreatePin failed with %x\n", Status); + /* This should not fail */ + KeBugCheck(0); + return; + } + } + + /* get pin file object */ + Status = ObReferenceObjectByHandle(RealPinHandle, + GENERIC_READ | GENERIC_WRITE, + IoFileObjectType, KernelMode, (PVOID*)&RealFileObject, NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get file object with %x\n", Status); + goto cleanup; + } + + if (WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].MaxPinInstanceCount == 1) + { + /* store the pin handle there if the pin can only be instantiated once*/ + WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].PinHandle = RealPinHandle; + } + + WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].References = 0; + WorkerContext->DispatchContext->Handle = RealPinHandle; + WorkerContext->DispatchContext->PinId = WorkerContext->PinConnect->PinId; + WorkerContext->DispatchContext->AudioEntry = WorkerContext->Entry; + WorkerContext->DispatchContext->FileObject = RealFileObject; + + /* Do we need to transform the audio stream */ + if (OutputFormat != NULL) + { + PKSDATAFORMAT InputFormat; + + /* Fetch input format */ + InputFormat = (PKSDATAFORMAT)(WorkerContext->PinConnect + 1); + + /* Now create the mixer pin */ + Status = CreateMixerPinAndSetFormat(WorkerContext->DeviceExtension->KMixerHandle, + MixerPinConnect, + InputFormat, + (PKSDATAFORMAT)OutputFormat, &WorkerContext->DispatchContext->hMixerPin, &WorkerContext->DispatchContext->MixerFileObject); + + if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create Mixer Pin with %x\n", Status); - SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); - ExFreePool(WorkerContext->DispatchContext); - return; - } - } - - if (WorkerContext->CreateRealPin) - { - /* create the real pin */ - DPRINT("Creating real pin\n"); - - if (WorkerContext->CreateMixerPin) - Status = KsCreatePin(WorkerContext->Entry->Handle, PinConnect, GENERIC_READ | GENERIC_WRITE, &RealPinHandle); - else - Status = KsCreatePin(WorkerContext->Entry->Handle, WorkerContext->PinConnect, GENERIC_READ | GENERIC_WRITE, &RealPinHandle); - - DPRINT("Status %x\n", Status); - if (!NT_SUCCESS(Status)) - { - PKSDATAFORMAT_WAVEFORMATEX RequestedFormat = (PKSDATAFORMAT_WAVEFORMATEX)(WorkerContext->PinConnect + 1); - DPRINT1("Failed to create Pin with %x\nNumChannels: %u BitsPerSample %u SampleRate %u\n", Status, - RequestedFormat->WaveFormatEx.nChannels, RequestedFormat->WaveFormatEx.wBitsPerSample, RequestedFormat->WaveFormatEx.nSamplesPerSec); - - if (WorkerContext->CreateMixerPin) - { - /* The mixer pin format should have been accepted */ - ObDereferenceObject(WorkerContext->DispatchContext->MixerFileObject); - ZwClose(WorkerContext->DispatchContext->hMixerPin); - KeBugCheck(0); - } - - SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); - ExFreePool(WorkerContext->DispatchContext); - ExFreePool(WorkerContext); - return; - } - - /* get pin file object */ - Status = ObReferenceObjectByHandle(RealPinHandle, - GENERIC_READ | GENERIC_WRITE, - IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to get file object with %x\n", Status); - SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); - ExFreePool(WorkerContext->DispatchContext); - return; - } - - if (WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].MaxPinInstanceCount == 1) - { - /* store the pin handle there if the pin can only be instantiated once*/ - WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].PinHandle = RealPinHandle; - } - - WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].References = 0; - WorkerContext->DispatchContext->Handle = RealPinHandle; - WorkerContext->DispatchContext->PinId = WorkerContext->PinConnect->PinId; - WorkerContext->DispatchContext->AudioEntry = WorkerContext->Entry; - WorkerContext->DispatchContext->FileObject = FileObject; - } - else - { - WorkerContext->DispatchContext->AudioEntry = WorkerContext->Entry; - WorkerContext->DispatchContext->Handle = WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].PinHandle; - WorkerContext->DispatchContext->PinId = WorkerContext->PinConnect->PinId; - - /* get pin file object */ - Status = ObReferenceObjectByHandle(WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].PinHandle, - GENERIC_READ | GENERIC_WRITE, - IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to get file object with %x %p\n", Status, WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].PinHandle); - SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); - ExFreePool(WorkerContext->DispatchContext); - return; - } - WorkerContext->DispatchContext->FileObject = FileObject; - - - /* re-using pin */ - PinRequest.Property.Set = KSPROPSETID_Connection; - PinRequest.Property.Flags = KSPROPERTY_TYPE_SET; - PinRequest.Property.Id = KSPROPERTY_CONNECTION_DATAFORMAT; - PinRequest.PinId = PinConnect->PinId; - - if (WorkerContext->MixerFormat) - ClientFormat = (PKSDATAFORMAT)WorkerContext->MixerFormat; - else - ClientFormat = (PKSDATAFORMAT)(WorkerContext->PinConnect + 1); - - /* set the format on the real pin */ - Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSPROPERTY), - (PVOID)ClientFormat, ClientFormat->FormatSize, &BytesReturned); + goto cleanup; + } } @@ -362,37 +314,21 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to create virtual pin with %x\n", Status); - if (WorkerContext->CreateRealPin) - { - /* mark pin as free to use */ - WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].References = 0; - } - - SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); - ExFreePool(WorkerContext->DispatchContext); - return; + DPRINT1("Failed to create virtual pin %x\n", Status); + goto cleanup; } /* get pin file object */ Status = ObReferenceObjectByHandle(VirtualPinHandle, GENERIC_READ | GENERIC_WRITE, - IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); + IoFileObjectType, KernelMode, (PVOID*)&VirtualFileObject, NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to get file object with %x\n", Status); - - ZwClose(VirtualPinHandle); - SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); - ExFreePool(WorkerContext->DispatchContext); - return; - } - - ASSERT(WorkerContext->DispatchContext); - ASSERT(WorkerContext->DispatchContext->AudioEntry != NULL); - ASSERT(WorkerContext->DispatchContext->FileObject != NULL); - ASSERT(WorkerContext->DispatchContext->Handle != NULL); + goto cleanup; + } + ASSERT(WorkerContext->AudioClient); ASSERT(WorkerContext->AudioClient->NumDevices > 0); ASSERT(WorkerContext->AudioClient->Devs != NULL); @@ -439,15 +375,39 @@ AudioClient->Devs[AudioClient->NumDevices -1].ClientHandlesCount++; WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].References++; } - + else + { + /* no memory */ + goto cleanup; + } /* store pin context */ - FileObject->FsContext2 = (PVOID)WorkerContext->DispatchContext; + VirtualFileObject->FsContext2 = (PVOID)WorkerContext->DispatchContext; DPRINT("Successfully created virtual pin %p\n", VirtualPinHandle); *((PHANDLE)WorkerContext->Irp->UserBuffer) = VirtualPinHandle; SetIrpIoStatus(WorkerContext->Irp, STATUS_SUCCESS, sizeof(HANDLE)); + return; + + +cleanup: + if (RealFileObject) + ObDereferenceObject(RealFileObject); + + if (RealPinHandle) + ZwClose(RealPinHandle); + + if (WorkerContext->DispatchContext->MixerFileObject) + ObDereferenceObject(WorkerContext->DispatchContext->MixerFileObject); + + if (WorkerContext->DispatchContext->hMixerPin) + ZwClose(WorkerContext->DispatchContext->hMixerPin); + + + ExFreePool(WorkerContext->DispatchContext); + SetIrpIoStatus(WorkerContext->Irp, Status, 0); + } NTSTATUS @@ -542,7 +502,8 @@ } } -BOOL + +NTSTATUS ComputeCompatibleFormat( IN PKSAUDIO_DEVICE_ENTRY Entry, IN ULONG PinId, @@ -552,41 +513,63 @@ { BOOL bFound; ULONG BytesReturned; - KSP_PIN PinRequest; + PKSP_PIN PinRequest; + NTSTATUS Status; + PKSMULTIPLE_ITEM MultipleItem; + ULONG Length; PKSDATARANGE_AUDIO AudioRange; - NTSTATUS Status; ULONG Index; - PKSMULTIPLE_ITEM MultipleItem; - - if (!DeviceExtension->KMixerHandle || !DeviceExtension->KMixerFileObject) - { - DPRINT1("KMixer is not available\n"); + + Length = sizeof(KSP_PIN) + sizeof(KSMULTIPLE_ITEM) + ClientFormat->DataFormat.FormatSize; + PinRequest = ExAllocatePool(NonPagedPool, Length); + if (!PinRequest) return STATUS_UNSUCCESSFUL; - } - - PinRequest.PinId = PinId; - PinRequest.Property.Set = KSPROPSETID_Pin; - PinRequest.Property.Flags = KSPROPERTY_TYPE_GET; - PinRequest.Property.Id = KSPROPERTY_PIN_DATARANGES; - - Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), NULL, 0, &BytesReturned); + + PinRequest->PinId = PinId; + PinRequest->Property.Set = KSPROPSETID_Pin; + PinRequest->Property.Flags = KSPROPERTY_TYPE_GET; + PinRequest->Property.Id = KSPROPERTY_PIN_DATAINTERSECTION; + + MultipleItem = (PKSMULTIPLE_ITEM)(PinRequest + 1); + MultipleItem->Count = 1; + MultipleItem->Size = sizeof(KSMULTIPLE_ITEM) + ClientFormat->DataFormat.FormatSize; + + RtlMoveMemory(MultipleItem + 1, ClientFormat, ClientFormat->DataFormat.FormatSize); + /* Query the miniport data intersection handler */ + Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)PinRequest, Length, (PVOID)MixerFormat, sizeof(KSDATAFORMAT_WAVEFORMATEX), &BytesReturned); + + DPRINT("Status %x\n", Status); + + if (NT_SUCCESS(Status)) + { + ExFreePool(PinRequest); + return Status; + } + + /* Setup request block */ + PinRequest->Property.Id = KSPROPERTY_PIN_DATARANGES; + /* Query pin data ranges */ + Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)PinRequest, sizeof(KSP_PIN), NULL, 0, &BytesReturned); + if (Status != STATUS_BUFFER_TOO_SMALL) { - DPRINT1("Property Request KSPROPERTY_PIN_DATARANGES failed with %x\n", Status); - return STATUS_UNSUCCESSFUL; + /* Failed to data ranges */ + return Status; } MultipleItem = ExAllocatePool(NonPagedPool, BytesReturned); if (!MultipleItem) { + ExFreePool(PinRequest); return STATUS_NO_MEMORY; } - Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), (PVOID)MultipleItem, BytesReturned, &BytesReturned); + Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)PinRequest, sizeof(KSP_PIN), (PVOID)MultipleItem, BytesReturned, &BytesReturned); if (!NT_SUCCESS(Status)) { DPRINT("Property Request KSPROPERTY_PIN_DATARANGES failed with %x\n", Status); ExFreePool(MultipleItem); + ExFreePool(PinRequest); return STATUS_UNSUCCESSFUL; } @@ -599,6 +582,7 @@ UNIMPLEMENTED AudioRange = (PKSDATARANGE_AUDIO)((PUCHAR)AudioRange + AudioRange->DataRange.FormatSize); } + /* Select best quality available */ MixerFormat->DataFormat.FormatSize = sizeof(KSDATAFORMAT) + sizeof(WAVEFORMATEX); MixerFormat->DataFormat.Flags = 0; MixerFormat->DataFormat.Reserved = 0; @@ -607,9 +591,9 @@ MixerFormat->DataFormat.Specifier = KSDATAFORMAT_SPECIFIER_WAVEFORMATEX; MixerFormat->DataFormat.SampleSize = 4; MixerFormat->WaveFormatEx.wFormatTag = ClientFormat->WaveFormatEx.wFormatTag; - MixerFormat->WaveFormatEx.nChannels = min(AudioRange->MaximumChannels, ClientFormat->WaveFormatEx.nChannels); - MixerFormat->WaveFormatEx.nSamplesPerSec = max(AudioRange->MinimumSampleFrequency, min(AudioRange->MaximumSampleFrequency, ClientFormat->WaveFormatEx.nSamplesPerSec)); - MixerFormat->WaveFormatEx.wBitsPerSample = max(AudioRange->MinimumBitsPerSample, min(AudioRange->MaximumBitsPerSample, ClientFormat->WaveFormatEx.wBitsPerSample)); + MixerFormat->WaveFormatEx.nChannels = min(2, AudioRange->MaximumChannels); /* AC97 does not support mono render / record */ + MixerFormat->WaveFormatEx.nSamplesPerSec = AudioRange->MaximumSampleFrequency; + MixerFormat->WaveFormatEx.wBitsPerSample = AudioRange->MaximumBitsPerSample; MixerFormat->WaveFormatEx.cbSize = 0; MixerFormat->WaveFormatEx.nBlockAlign = (MixerFormat->WaveFormatEx.nChannels * MixerFormat->WaveFormatEx.wBitsPerSample) / 8; MixerFormat->WaveFormatEx.nAvgBytesPerSec = MixerFormat->WaveFormatEx.nChannels * MixerFormat->WaveFormatEx.nSamplesPerSec * (MixerFormat->WaveFormatEx.wBitsPerSample / 8); @@ -619,15 +603,18 @@ AudioRange = (PKSDATARANGE_AUDIO)((PUCHAR)AudioRange + AudioRange->DataRange.FormatSize); } + +#if 0 + DPRINT1("\nNum Max Channels %u Channels %u Old Channels %u\n Max SampleRate %u SampleRate %u Old SampleRate %u\n Max BitsPerSample %u BitsPerSample %u Old BitsPerSample %u\n", + AudioRange->MaximumChannels, MixerFormat->WaveFormatEx.nChannels, ClientFormat->WaveFormatEx.nChannels, + AudioRange->MaximumSampleFrequency, MixerFormat->WaveFormatEx.nSamplesPerSec, ClientFormat->WaveFormatEx.nSamplesPerSec, + AudioRange->MaximumBitsPerSample, MixerFormat->WaveFormatEx.wBitsPerSample, ClientFormat->WaveFormatEx.wBitsPerSample); + + +#endif + ExFreePool(MultipleItem); - - -#if 0 - DPRINT1("\nNum Channels %u Old Channels %u\n SampleRate %u Old SampleRate %u\n BitsPerSample %u Old BitsPerSample %u\n ClientFormat %p", - MixerFormat->WaveFormatEx.nChannels, ClientFormat->WaveFormatEx.nChannels, - MixerFormat->WaveFormatEx.nSamplesPerSec, ClientFormat->WaveFormatEx.nSamplesPerSec, - MixerFormat->WaveFormatEx.wBitsPerSample, ClientFormat->WaveFormatEx.wBitsPerSample, ClientFormat); -#endif + ExFreePool(PinRequest); if (bFound) return STATUS_SUCCESS; @@ -678,10 +665,18 @@ ASSERT(ClientInfo->Devs[Index].ClientHandles[SubIndex].bHandle == FALSE); DispatchContext = ClientInfo->Devs[Index].ClientHandles[SubIndex].DispatchContext; - ObDereferenceObject(DispatchContext->MixerFileObject); - ObDereferenceObject(DispatchContext->FileObject); - ZwClose(DispatchContext->hMixerPin); - ZwClose(DispatchContext->Handle); + + if (DispatchContext->MixerFileObject) + ObDereferenceObject(DispatchContext->MixerFileObject); + + if (DispatchContext->hMixerPin) + ZwClose(DispatchContext->hMixerPin); + + if (DispatchContext->FileObject) + ObDereferenceObject(DispatchContext->FileObject); + + if (DispatchContext->Handle) + ZwClose(DispatchContext->Handle); ClientInfo->Devs[Index].ClientHandles[SubIndex].PinId = (ULONG)-1; } } @@ -698,20 +693,18 @@ PSYSAUDIODEVEXT DeviceExtension, PDEVICE_OBJECT DeviceObject) { - ULONG Length, BytesReturned; + ULONG Length; PKSAUDIO_DEVICE_ENTRY Entry; KSPIN_CONNECT * PinConnect; PIO_STACK_LOCATION IoStack; PSYSAUDIO_INSTANCE_INFO InstanceInfo; PSYSAUDIO_CLIENT ClientInfo; PKSOBJECT_CREATE_ITEM CreateItem; - KSP_PIN PinRequest; NTSTATUS Status; KSPIN_CINSTANCES PinInstances; PPIN_WORKER_CONTEXT WorkerContext; PDISPATCH_CONTEXT DispatchContext; - BOOL CreateMixerPin; - PKSDATAFORMAT_WAVEFORMATEX MixerFormat = NULL, ClientFormat; + IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -783,43 +776,6 @@ return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); } - /* check the format */ - PinRequest.PinId = PinConnect->PinId; - PinRequest.Property.Set = KSPROPSETID_Pin; - PinRequest.Property.Flags = KSPROPERTY_TYPE_SET; - PinRequest.Property.Id = KSPROPERTY_PIN_PROPOSEDATAFORMAT; - - CreateMixerPin = FALSE; - BytesReturned = IoStack->Parameters.DeviceIoControl.InputBufferLength - sizeof(KSPIN_CONNECT) - sizeof(SYSAUDIO_INSTANCE_INFO); - ClientFormat = (PKSDATAFORMAT_WAVEFORMATEX)(PinConnect + 1); - - Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), (PVOID)ClientFormat, BytesReturned, &BytesReturned); - if (!NT_SUCCESS(Status)) - { - //DPRINT("Property Request KSPROPERTY_PIN_PROPOSEDATAFORMAT failed with %x\n", Status); - - if (!DeviceExtension->KMixerHandle || !DeviceExtension->KMixerFileObject) - { - DPRINT1("KMixer is not available\n"); - DbgBreakPoint(); - return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); - } - - MixerFormat = ExAllocatePool(NonPagedPool, sizeof(KSDATAFORMAT_WAVEFORMATEX)); - if (!MixerFormat) - { - return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); - } - - Status = ComputeCompatibleFormat(Entry, PinConnect->PinId, DeviceExtension, ClientFormat, MixerFormat); - if (!NT_SUCCESS(Status)) - { - ExFreePool(MixerFormat); - return SetIrpIoStatus(Irp, Status, 0); - } - CreateMixerPin = TRUE; - } - if (PinInstances.CurrentCount == PinInstances.PossibleCount) { /* pin already exists */ @@ -828,8 +784,6 @@ { /* FIXME need ksmixer */ DPRINT1("Device %u Pin %u References %u is already occupied, try later\n", InstanceInfo->DeviceNumber, PinConnect->PinId, Entry->Pins[PinConnect->PinId].References); - if (MixerFormat) - ExFreePool(MixerFormat); return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); } } @@ -841,10 +795,7 @@ DispatchContext = ExAllocatePool(NonPagedPool, sizeof(DISPATCH_CONTEXT)); if (!DispatchContext) { - if (MixerFormat) - { - ExFreePool(MixerFormat); - } + /* no memory */ return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); } @@ -871,9 +822,7 @@ WorkerContext->Irp = Irp; WorkerContext->PinConnect = PinConnect; WorkerContext->AudioClient = ClientInfo; - WorkerContext->CreateMixerPin = CreateMixerPin; WorkerContext->DeviceExtension = DeviceExtension; - WorkerContext->MixerFormat = MixerFormat; DPRINT("Queing Irp %p\n", Irp); /* queue the work item */ Modified: trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] Tue Apr 14 18:59:51 2009 @@ -116,9 +116,16 @@ Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].References--; DispatchContext = (PDISPATCH_CONTEXT)Client->Devs[Index].ClientHandles[SubIndex].DispatchContext; - ObDereferenceObject(DispatchContext->MixerFileObject); - ObDereferenceObject(DispatchContext->FileObject); - ZwClose(DispatchContext->hMixerPin); + + if (DispatchContext->MixerFileObject) + ObDereferenceObject(DispatchContext->MixerFileObject); + + if (DispatchContext->hMixerPin) + ZwClose(DispatchContext->hMixerPin); + + if (DispatchContext->FileObject) + ObDereferenceObject(DispatchContext->FileObject); + ExFreePool(DispatchContext); //DPRINT1("Index %u DeviceIndex %u Pin %u References %u\n", Index, Client->Devs[Index].DeviceId, SubIndex, Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].References); @@ -272,7 +279,7 @@ if (!wcsncmp(KS_NAME_PIN, Buffer, wcslen(KS_NAME_PIN))) { Status = CreateDispatcher(Irp); - DPRINT1("Virtual pin Status %x FileObject %p\n", Status, IoStatus->FileObject); + DPRINT("Virtual pin Status %x FileObject %p\n", Status, IoStatus->FileObject); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status;

1 0

[janderwald] 40499: - Handle KSPROPERTY_PIN_DATAINTERSECTION
by janderwald＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: janderwald Date: Tue Apr 14 15:07:15 2009 New Revision: 40499 URL: http://svn.reactos.org/svn/reactos?rev=40499&view=rev Log: - Handle KSPROPERTY_PIN_DATAINTERSECTION Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Tue Apr 14 15:07:15 2009 @@ -33,13 +33,19 @@ IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl*)iface; if (IsEqualGUIDAligned(refiid, &IID_IIrpTarget) || - //IsEqualGUIDAligned(refiid, &IID_IPortFilterWaveCyclic) || IsEqualGUIDAligned(refiid, &IID_IUnknown)) { *Output = &This->lpVtbl; InterlockedIncrement(&This->ref); return STATUS_SUCCESS; } + else if (IsEqualGUIDAligned(refiid, &IID_IPort)) + { + *Output = This->Port; + This->Port->lpVtbl->AddRef(This->Port); + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] Tue Apr 14 15:07:15 2009 @@ -63,6 +63,74 @@ Irp->IoStatus.Information = sizeof(ULONG); Irp->IoStatus.Status = STATUS_SUCCESS; return STATUS_SUCCESS; +} + +NTSTATUS +HandleDataIntersection( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data, + IN PSUBDEVICE_DESCRIPTOR Descriptor) +{ + IIrpTarget * IrpTarget; + IPort *Port; + ISubdevice *SubDevice; + KSP_PIN * Pin = (KSP_PIN*)Request; + PKSOBJECT_CREATE_ITEM CreateItem; + PKSMULTIPLE_ITEM MultipleItem; + PKSDATARANGE DataRange; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + ULONG Index, Length; + + /* Access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* Get the IrpTarget */ + IrpTarget = (IIrpTarget*)CreateItem->Context; + /* Get the parent */ + Status = IrpTarget->lpVtbl->QueryInterface(IrpTarget, &IID_IPort, (PVOID*)&Port); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to obtain IPort interface from filter\n"); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; + } + + /* Get private ISubdevice interface */ + Status = Port->lpVtbl->QueryInterface(Port, &IID_ISubdevice, (PVOID*)&SubDevice); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to obtain ISubdevice interface from port driver\n"); + KeBugCheck(0); + } + + /* Access parameters */ + MultipleItem = (PKSMULTIPLE_ITEM)(Request + 1); + DataRange = (PKSDATARANGE)(MultipleItem + 1); + + /* Get current stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + for(Index = 0; Index < MultipleItem->Count; Index++) + { + /* Call miniport's properitary handler */ + Status = SubDevice->lpVtbl->DataRangeIntersection(SubDevice, Pin->PinId, DataRange, (PKSDATARANGE)&Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRanges[0], + IoStack->Parameters.DeviceIoControl.OutputBufferLength, Data, &Length); + + if (Status == STATUS_SUCCESS) + { + Irp->IoStatus.Information = Length; + break; + } + DataRange = UlongToPtr(PtrToUlong(DataRange) + DataRange->FormatSize); + } + + /* Release reference */ + Port->lpVtbl->Release(Port); + + Irp->IoStatus.Status = Status; + return Status; } @@ -103,6 +171,8 @@ break; case KSPROPERTY_PIN_DATAINTERSECTION: + Status = HandleDataIntersection(Irp, Request, Data, Descriptor); + break; case KSPROPERTY_PIN_PHYSICALCONNECTION: case KSPROPERTY_PIN_CONSTRAINEDDATARANGES: DPRINT1("Unhandled %x\n", Request->Id); @@ -141,7 +211,7 @@ PFNKSHANDLER PropertyHandler = NULL; UNICODE_STRING GuidString; NTSTATUS Status = STATUS_UNSUCCESSFUL; - PCPROPERTY_REQUEST PropertyRequest; + PPCPROPERTY_REQUEST PropertyRequest; IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -159,17 +229,25 @@ { if(Descriptor->DeviceDescriptor->AutomationTable->Properties[Index].Flags & Property->Flags) { - RtlZeroMemory(&PropertyRequest, sizeof(PCPROPERTY_REQUEST)); - PropertyRequest.PropertyItem = &Descriptor->DeviceDescriptor->AutomationTable->Properties[Index]; - PropertyRequest.Verb = Property->Flags; - PropertyRequest.Value = Irp->UserBuffer; - PropertyRequest.ValueSize = IoStack->Parameters.DeviceIoControl.OutputBufferLength; - PropertyRequest.Irp = Irp; + PropertyRequest = ExAllocatePool(NonPagedPool, sizeof(PCPROPERTY_REQUEST)); + if (!PropertyRequest) + { + /* no memory */ + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlZeroMemory(PropertyRequest, sizeof(PCPROPERTY_REQUEST)); + PropertyRequest->PropertyItem = &Descriptor->DeviceDescriptor->AutomationTable->Properties[Index]; + PropertyRequest->Verb = Property->Flags; + PropertyRequest->Value = Irp->UserBuffer; + PropertyRequest->ValueSize = IoStack->Parameters.DeviceIoControl.OutputBufferLength; + PropertyRequest->Irp = Irp; DPRINT("Calling handler %p\n", Descriptor->DeviceDescriptor->AutomationTable->Properties[Index].Handler); - Status = Descriptor->DeviceDescriptor->AutomationTable->Properties[Index].Handler(&PropertyRequest); - - Irp->IoStatus.Information = PropertyRequest.ValueSize; + Status = Descriptor->DeviceDescriptor->AutomationTable->Properties[Index].Handler(PropertyRequest); + Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; @@ -236,5 +314,3 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } - -

1 0

[janderwald] 40498: - Fix warning
by janderwald＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: janderwald Date: Tue Apr 14 15:03:32 2009 New Revision: 40498 URL: http://svn.reactos.org/svn/reactos?rev=40498&view=rev Log: - Fix warning Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Tue Apr 14 15:03:32 2009 @@ -1079,6 +1079,9 @@ IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, \ IN ULONG CreateOptiona OPTIONAL, \ OUT PULONG Disposition OPTIONAL); + +#undef INTERFACE +#define INTERFACE IPort DECLARE_INTERFACE_(IPort, IUnknown) {

1 0

[fireball] 40497: - usetup expects the videomode to be set, and fonts to be loaded. Change setupldr2 accordingly. This fixes the "blank" blue screen in the beginning of first stage (when started with setupldr2 of course).
by fireball＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: fireball Date: Tue Apr 14 14:36:16 2009 New Revision: 40497 URL: http://svn.reactos.org/svn/reactos?rev=40497&view=rev Log: - usetup expects the videomode to be set, and fonts to be loaded. Change setupldr2 accordingly. This fixes the "blank" blue screen in the beginning of first stage (when started with setupldr2 of course). Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] Tue Apr 14 14:36:16 2009 @@ -320,7 +320,7 @@ LoaderBlockVA = PaToVa(LoaderBlock); /* "Stop all motors", change videomode */ - MachPrepareForReactOS(FALSE); + MachPrepareForReactOS(TRUE); /* Debugging... */ //DumpMemoryAllocMap();

1 0

[janderwald] 40496: - Use a work item for each specific task: start, stop, close - Should fix bug 4365
by janderwald＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: janderwald Date: Tue Apr 14 11:21:05 2009 New Revision: 40496 URL: http://svn.reactos.org/svn/reactos?rev=40496&view=rev Log: - Use a work item for each specific task: start, stop, close - Should fix bug 4365 Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Tue Apr 14 11:21:05 2009 @@ -91,7 +91,7 @@ NTSTATUS status = STATUS_UNSUCCESSFUL; PDEVICE_OBJECT fdo = NULL; PDEVICE_OBJECT PrevDeviceObject; - PPCLASS_DEVICE_EXTENSION portcls_ext; + PPCLASS_DEVICE_EXTENSION portcls_ext = NULL; DPRINT1("PcAddAdapterDevice called\n"); @@ -138,8 +138,8 @@ if (!portcls_ext->CreateItems) { /* not enough resources */ - IoDeleteDevice(fdo); - return STATUS_INSUFFICIENT_RESOURCES; + status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; } /* store the physical device object */ @@ -157,32 +157,41 @@ fdo->Flags &= ~ DO_DEVICE_INITIALIZING; /* allocate work item */ - portcls_ext->WorkItem = IoAllocateWorkItem(fdo); - - if (!portcls_ext->WorkItem) + portcls_ext->CloseWorkItem = IoAllocateWorkItem(fdo); + + if (!portcls_ext->CloseWorkItem) { /* not enough resources */ - FreeItem(portcls_ext->CreateItems, TAG_PORTCLASS); - /* delete created fdo */ - IoDeleteDevice(fdo); - /* return error code */ - return STATUS_INSUFFICIENT_RESOURCES; - } - + goto cleanup; + status = STATUS_INSUFFICIENT_RESOURCES; + } + + /* allocate work item */ + portcls_ext->StartWorkItem = IoAllocateWorkItem(fdo); + + if (!portcls_ext->StartWorkItem) + { + /* not enough resources */ + goto cleanup; + status = STATUS_INSUFFICIENT_RESOURCES; + } + + /* allocate work item */ + portcls_ext->StopWorkItem = IoAllocateWorkItem(fdo); + + if (!portcls_ext->StopWorkItem) + { + /* not enough resources */ + goto cleanup; + status = STATUS_INSUFFICIENT_RESOURCES; + } /* allocate the device header */ status = KsAllocateDeviceHeader(&portcls_ext->KsDeviceHeader, MaxObjects, portcls_ext->CreateItems); /* did we succeed */ if (!NT_SUCCESS(status)) { - /* free previously allocated create items */ - FreeItem(portcls_ext->CreateItems, TAG_PORTCLASS); - /* free allocated work item */ - IoFreeWorkItem(portcls_ext->WorkItem); - /* delete created fdo */ - IoDeleteDevice(fdo); - /* return error code */ - return status; + goto cleanup; } /* attach device to device stack */ @@ -196,16 +205,52 @@ } else { - /* free the device header */ - KsFreeDeviceHeader(portcls_ext->KsDeviceHeader); - /* free previously allocated create items */ - FreeItem(portcls_ext->CreateItems, TAG_PORTCLASS); - /* free allocated work item */ - IoFreeWorkItem(portcls_ext->WorkItem); + /* return error code */ + status = STATUS_UNSUCCESSFUL; + goto cleanup; + } + return status; + +cleanup: + + if (portcls_ext) + { + + if (portcls_ext->KsDeviceHeader) + { + /* free the device header */ + KsFreeDeviceHeader(portcls_ext->KsDeviceHeader); + } + + if (portcls_ext->CloseWorkItem) + { + /* free allocated work item */ + IoFreeWorkItem(portcls_ext->CloseWorkItem); + } + + if (portcls_ext->StartWorkItem) + { + /* free allocated work item */ + IoFreeWorkItem(portcls_ext->StartWorkItem); + } + + if (portcls_ext->StopWorkItem) + { + /* free allocated work item */ + IoFreeWorkItem(portcls_ext->StopWorkItem); + } + + if (portcls_ext->CreateItems) + { + /* free previously allocated create items */ + FreeItem(portcls_ext->CreateItems, TAG_PORTCLASS); + } + } + + if (fdo) + { /* delete created fdo */ IoDeleteDevice(fdo); - /* return error code */ - return STATUS_UNSUCCESSFUL; } return status; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] Tue Apr 14 11:21:05 2009 @@ -404,6 +404,9 @@ KeLowerIrql(OldIrql); This->DmaStarted = FALSE; + + IoFreeMdl(This->Mdl); + This->Mdl = NULL; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Tue Apr 14 11:21:05 2009 @@ -113,6 +113,7 @@ if (This->Pins[ConnectDetails->PinId] && This->Descriptor->Factory.Instances[ConnectDetails->PinId].CurrentPinInstanceCount) { /* release existing instance */ + ASSERT(0); This->Pins[ConnectDetails->PinId]->lpVtbl->Close(This->Pins[ConnectDetails->PinId], DeviceObject, NULL); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Tue Apr 14 11:21:05 2009 @@ -199,12 +199,18 @@ IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) { + PPCLASS_DEVICE_EXTENSION DeviceExtension; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)Context; + /* Set the state to stop */ + This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); + /* Set internal state to stop */ + This->State = KSSTATE_STOP; + + /* Get device extension */ + DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DPRINT1("Stopping %u Irql %u\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), KeGetCurrentIrql()); - - This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); - This->State = KSSTATE_STOP; } VOID @@ -219,15 +225,24 @@ PPCLASS_DEVICE_EXTENSION DeviceExtension; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)DeferredContext; + ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); + + /* Has the audio stream resumed? */ if (This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue)) return; + /* Has the audio stream already stopped */ + if (This->State == KSSTATE_STOP) + return; + /* Get device object */ DeviceObject = GetDeviceObject(This->Port); + /* Get device extension */ DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + /* queue the work item */ - IoQueueWorkItem(DeviceExtension->WorkItem, StopStreamWorkerRoutine, DelayedWorkQueue, (PVOID)This); + IoQueueWorkItem(DeviceExtension->StopWorkItem, StopStreamWorkerRoutine, DelayedWorkQueue, (PVOID)This); } static @@ -696,23 +711,18 @@ if (This->Stream) { - if (Irp) - { - This->CloseIrp = Irp; - IoMarkIrpPending(Irp); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_PENDING; - } /* Get device extension */ DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + This->CloseIrp = Irp; + IoMarkIrpPending(Irp); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_PENDING; + /* defer work item */ - IoQueueWorkItem(DeviceExtension->WorkItem, CloseStreamRoutine, DelayedWorkQueue, (PVOID)This); - - if (Irp) - { - /* The WaveCyclic filter passes close request with NULL / IRP */ - return STATUS_PENDING; - } + IoQueueWorkItem(DeviceExtension->CloseWorkItem, CloseStreamRoutine, DelayedWorkQueue, (PVOID)This); + /* Return result */ + return STATUS_PENDING; } if (Irp) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Tue Apr 14 11:21:05 2009 @@ -602,8 +602,7 @@ Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_PENDING; IoMarkIrpPending(Irp); - IoQueueWorkItem(DeviceExt->WorkItem, CreatePinWorkerRoutine, DelayedWorkQueue, (PVOID)Context); - + IoQueueWorkItem(DeviceExt->StartWorkItem, CreatePinWorkerRoutine, DelayedWorkQueue, (PVOID)Context); return STATUS_PENDING; } } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Tue Apr 14 11:21:05 2009 @@ -156,7 +156,10 @@ ULONG MaxSubDevices; KSOBJECT_CREATE_ITEM * CreateItems; - PIO_WORKITEM WorkItem; + PIO_WORKITEM StartWorkItem; + PIO_WORKITEM StopWorkItem; + PIO_WORKITEM CloseWorkItem; + IResourceList* resources; LIST_ENTRY SubDeviceList; LIST_ENTRY PhysicalConnectionList; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c [iso-8859-1] Tue Apr 14 11:21:05 2009 @@ -29,7 +29,7 @@ */ NTSTATUS -STDMETHODCALLTYPE +NTAPI IResourceList_fnQueryInterface( IResourceList* iface, IN REFIID refiid, @@ -56,7 +56,7 @@ } ULONG -STDMETHODCALLTYPE +NTAPI IResourceList_fnAddRef( IResourceList* iface) { @@ -66,7 +66,7 @@ } ULONG -STDMETHODCALLTYPE +NTAPI IResourceList_fnRelease( IResourceList* iface) { @@ -93,7 +93,7 @@ */ ULONG -STDMETHODCALLTYPE +NTAPI IResourceList_fnNumberOfEntries(IResourceList* iface) { IResourceListImpl * This = (IResourceListImpl*)iface; @@ -102,7 +102,7 @@ } ULONG -STDMETHODCALLTYPE +NTAPI IResourceList_fnNumberOfEntriesOfType( IResourceList* iface, IN CM_RESOURCE_TYPE Type) @@ -129,7 +129,7 @@ } PCM_PARTIAL_RESOURCE_DESCRIPTOR -STDMETHODCALLTYPE +NTAPI IResourceList_fnFindTranslatedEntry( IResourceList* iface, IN CM_RESOURCE_TYPE Type, @@ -158,7 +158,7 @@ } PCM_PARTIAL_RESOURCE_DESCRIPTOR -STDMETHODCALLTYPE +NTAPI IResourceList_fnFindUntranslatedEntry( IResourceList* iface, IN CM_RESOURCE_TYPE Type, @@ -186,7 +186,7 @@ } NTSTATUS -STDMETHODCALLTYPE +NTAPI IResourceList_fnAddEntry( IResourceList* iface, IN PCM_PARTIAL_RESOURCE_DESCRIPTOR Translated, @@ -242,7 +242,7 @@ } NTSTATUS -STDMETHODCALLTYPE +NTAPI IResourceList_fnAddEntryFromParent( IResourceList* iface, IN IResourceList* Parent, @@ -281,7 +281,7 @@ } PCM_RESOURCE_LIST -STDMETHODCALLTYPE +NTAPI IResourceList_fnTranslatedList( IResourceList* iface) { @@ -291,7 +291,7 @@ } PCM_RESOURCE_LIST -STDMETHODCALLTYPE +NTAPI IResourceList_fnUntranslatedList( IResourceList* iface) { @@ -325,7 +325,9 @@ /* Factory for creating a resource list */ -PORTCLASSAPI NTSTATUS NTAPI +PORTCLASSAPI +NTSTATUS +NTAPI PcNewResourceList( OUT PRESOURCELIST* OutResourceList, IN PUNKNOWN OuterUnknown OPTIONAL, @@ -338,8 +340,6 @@ IResourceListImpl* NewList; /* TODO: Validate parameters */ - - DPRINT("PcNewResourceList\n"); NewList = AllocateItem(PoolType, sizeof(IResourceListImpl), TAG_PORTCLASS);

1 0

[tkreuzer] 40495: EngBitBlt provides bitblt capabilities between standard-format bitmap surfaces. It does not provide transfer between different opaque device managed surfaces. So get rid of IntEngEnter/Leave in EngBitBlt. Also GDI should call the drivers function if *any* of the surfaces is managed by the driver, and only in the case that the other surface is an opaque surface managed by a different driver, GDI needs to provide an intermediate surface using DrvCopyBits, and in this case only fo
by tkreuzer＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: tkreuzer Date: Tue Apr 14 06:47:15 2009 New Revision: 40495 URL: http://svn.reactos.org/svn/reactos?rev=40495&view=rev Log: EngBitBlt provides bitblt capabilities between standard-format bitmap surfaces. It does not provide transfer between different opaque device managed surfaces. So get rid of IntEngEnter/Leave in EngBitBlt. Also GDI should call the drivers function if *any* of the surfaces is managed by the driver, and only in the case that the other surface is an opaque surface managed by a different driver, GDI needs to provide an intermediate surface using DrvCopyBits, and in this case only for the source surface, never for the target surface. This situation can currently not occur on reactos, as we do not support more than one display driver. This fixes the problem incredible recursive call chains and excessive copying. Improves mouse pointer performance. Other Eng functions are tbd. DrvBitBlt is never called with a single clipping rectangle, so set pco to NULL if it's complexity is DC_RECT, as we clipped the bounding rect already and EngBitBlt is not called when DrvBitBlt fails. Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Tue Apr 14 06:47:15 2009 @@ -4,6 +4,7 @@ * PURPOSE: GDI BitBlt Functions * FILE: subsys/win32k/eng/bitblt.c * PROGRAMER: Jason Filby + * Timo Kreuzer * REVISION HISTORY: * 2/10/1999: Created */ @@ -285,7 +286,7 @@ POINTL *MaskOrigin, BRUSHOBJ *pbo, POINTL *BrushOrigin, - ROP4 Rop4) + ROP4 rop4) { BYTE clippingType; RECTL CombinedRect; @@ -294,10 +295,7 @@ POINTL InputPoint; RECTL InputRect; RECTL OutputRect; - POINTL Translate; - INTENG_ENTER_LEAVE EnterLeaveSource; - INTENG_ENTER_LEAVE EnterLeaveDest; - SURFOBJ* InputObj; + SURFOBJ* InputObj = 0; SURFOBJ* OutputObj; PBLTRECTFUNC BltRectFunc; BOOLEAN Ret = TRUE; @@ -309,9 +307,9 @@ BOOL UsesPattern; POINTL AdjustedBrushOrigin; - UsesSource = ROP4_USES_SOURCE(Rop4); - UsesPattern = ROP4_USES_PATTERN(Rop4); - if (R4_NOOP == Rop4) + UsesSource = ROP4_USES_SOURCE(rop4); + UsesPattern = ROP4_USES_PATTERN(rop4); + if (R4_NOOP == rop4) { /* Copy destination onto itself: nop */ return TRUE; @@ -367,14 +365,7 @@ InputRect.top = InputPoint.y; InputRect.bottom = InputPoint.y + (OutputRect.bottom - OutputRect.top); - if (! IntEngEnter(&EnterLeaveSource, SourceObj, &InputRect, TRUE, - &Translate, &InputObj)) - { - return FALSE; - } - - InputPoint.x += Translate.x; - InputPoint.y += Translate.y; + InputObj = SourceObj; } else { @@ -415,36 +406,20 @@ if (OutputRect.right <= OutputRect.left || OutputRect.bottom <= OutputRect.top) { - if (UsesSource) - { - IntEngLeave(&EnterLeaveSource); - } return TRUE; } - if (! IntEngEnter(&EnterLeaveDest, DestObj, &OutputRect, FALSE, &Translate, - &OutputObj)) - { - if (UsesSource) - { - IntEngLeave(&EnterLeaveSource); - } - return FALSE; - } - - OutputRect.left += Translate.x; - OutputRect.right += Translate.x; - OutputRect.top += Translate.y; - OutputRect.bottom += Translate.y; + OutputObj = DestObj; if (BrushOrigin) { - AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; - AdjustedBrushOrigin.y = BrushOrigin->y + Translate.y; - } - else - { - AdjustedBrushOrigin = Translate; + AdjustedBrushOrigin.x = BrushOrigin->x; + AdjustedBrushOrigin.y = BrushOrigin->y; + } + else + { + AdjustedBrushOrigin.x = 0; + AdjustedBrushOrigin.y = 0; } /* Determine clipping type */ @@ -457,11 +432,11 @@ clippingType = ClipRegion->iDComplexity; } - if (R4_MASK == Rop4) + if (R4_MASK == rop4) { BltRectFunc = BltMask; } - else if (ROP3_TO_ROP4(PATCOPY) == Rop4) + else if (ROP3_TO_ROP4(PATCOPY) == rop4) { if (pbo && pbo->iSolidColor == 0xFFFFFFFF) BltRectFunc = CallDibBitBlt; @@ -479,21 +454,21 @@ case DC_TRIVIAL: Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation, &OutputRect, &InputPoint, MaskOrigin, pbo, - &AdjustedBrushOrigin, Rop4); + &AdjustedBrushOrigin, rop4); break; case DC_RECT: /* Clip the blt to the clip rectangle */ - ClipRect.left = ClipRegion->rclBounds.left + Translate.x; - ClipRect.right = ClipRegion->rclBounds.right + Translate.x; - ClipRect.top = ClipRegion->rclBounds.top + Translate.y; - ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y; + ClipRect.left = ClipRegion->rclBounds.left; + ClipRect.right = ClipRegion->rclBounds.right; + ClipRect.top = ClipRegion->rclBounds.top; + ClipRect.bottom = ClipRegion->rclBounds.bottom; if (RECTL_bIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) { Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation, &CombinedRect, &Pt, MaskOrigin, pbo, - &AdjustedBrushOrigin, Rop4); + &AdjustedBrushOrigin, rop4); } break; case DC_COMPLEX: @@ -523,10 +498,10 @@ for (i = 0; i < RectEnum.c; i++) { - ClipRect.left = RectEnum.arcl[i].left + Translate.x; - ClipRect.right = RectEnum.arcl[i].right + Translate.x; - ClipRect.top = RectEnum.arcl[i].top + Translate.y; - ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y; + ClipRect.left = RectEnum.arcl[i].left; + ClipRect.right = RectEnum.arcl[i].right; + ClipRect.top = RectEnum.arcl[i].top; + ClipRect.bottom = RectEnum.arcl[i].bottom; if (RECTL_bIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) { Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; @@ -534,7 +509,7 @@ Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation, &CombinedRect, &Pt, MaskOrigin, pbo, &AdjustedBrushOrigin, - Rop4) && Ret; + rop4) && Ret; } } } @@ -542,170 +517,141 @@ break; } - - IntEngLeave(&EnterLeaveDest); - if (UsesSource) - { - IntEngLeave(&EnterLeaveSource); - } - return Ret; } BOOL APIENTRY -IntEngBitBltEx(SURFOBJ *psoDest, - SURFOBJ *psoSource, - SURFOBJ *MaskSurf, - CLIPOBJ *ClipRegion, - XLATEOBJ *ColorTranslation, - RECTL *DestRect, - POINTL *SourcePoint, - POINTL *MaskOrigin, - BRUSHOBJ *pbo, - POINTL *BrushOrigin, - ROP4 Rop4, - BOOL RemoveMouse) +IntEngBitBltEx( + SURFOBJ *psoTrg, + SURFOBJ *psoSrc, + SURFOBJ *psoMask, + CLIPOBJ *pco, + XLATEOBJ *pxlo, + RECTL *prclTrg, + POINTL *pptlSrc, + POINTL *pptlMask, + BRUSHOBJ *pbo, + POINTL *pptlBrush, + ROP4 rop4, + BOOL bRemoveMouse) { - BOOLEAN ret; - RECTL InputClippedRect; - RECTL OutputRect; - POINTL InputPoint; - BOOLEAN UsesSource; - SURFACE *psurfDest; - SURFACE *psurfSource = NULL; - - if (psoDest == NULL) - return FALSE; - - psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); - ASSERT(psurfDest); - - InputClippedRect = *DestRect; - if (InputClippedRect.right < InputClippedRect.left) - { - InputClippedRect.left = DestRect->right; - InputClippedRect.right = DestRect->left; - } - if (InputClippedRect.bottom < InputClippedRect.top) - { - InputClippedRect.top = DestRect->bottom; - InputClippedRect.bottom = DestRect->top; - } - UsesSource = ROP4_USES_SOURCE(Rop4); - if (UsesSource) - { - if (NULL == SourcePoint || NULL == psoSource) - { - return FALSE; - } - InputPoint = *SourcePoint; - - /* Make sure we don't try to copy anything outside the valid source - region */ - if (InputPoint.x < 0) - { - InputClippedRect.left -= InputPoint.x; - InputPoint.x = 0; - } - if (InputPoint.y < 0) - { - InputClippedRect.top -= InputPoint.y; - InputPoint.y = 0; - } - if (psoSource->sizlBitmap.cx < InputPoint.x + - InputClippedRect.right - - InputClippedRect.left) - { - InputClippedRect.right = InputClippedRect.left + - psoSource->sizlBitmap.cx - InputPoint.x; - } - if (psoSource->sizlBitmap.cy < InputPoint.y + - InputClippedRect.bottom - - InputClippedRect.top) - { - InputClippedRect.bottom = InputClippedRect.top + - psoSource->sizlBitmap.cy - InputPoint.y; - } - - if (InputClippedRect.right < InputClippedRect.left || - InputClippedRect.bottom < InputClippedRect.top) - { - /* Everything clipped away, nothing to do */ + SURFACE *psurfTrg; + SURFACE *psurfSrc = NULL; + BOOL bResult; + RECTL rclClipped; + RECTL rclSrc; +// INTENG_ENTER_LEAVE EnterLeaveSource; +// INTENG_ENTER_LEAVE EnterLeaveDest; + PFN_DrvBitBlt pfnBitBlt; + + ASSERT(psoTrg); + psurfTrg = CONTAINING_RECORD(psoTrg, SURFACE, SurfObj); + + /* FIXME: Should we really allow to pass non-well-ordered rects? */ + rclClipped = *prclTrg; + RECTL_vMakeWellOrdered(&rclClipped); + + /* Clip target rect against the bounds of the clipping region */ + if (pco) + { + if (!RECTL_bIntersectRect(&rclClipped, &rclClipped, &pco->rclBounds)) + { + /* Nothing left */ return TRUE; } - } - - /* Clip against the bounds of the clipping region so we won't try to write - * outside the surface */ - if (NULL != ClipRegion) - { - if (!RECTL_bIntersectRect(&OutputRect, &InputClippedRect, - &ClipRegion->rclBounds)) - { - return TRUE; - } - InputPoint.x += OutputRect.left - InputClippedRect.left; - InputPoint.y += OutputRect.top - InputClippedRect.top; - } - else - { - OutputRect = InputClippedRect; - } - - if (RemoveMouse) - { - SURFACE_LockBitmapBits(psurfDest); - - if (UsesSource) - { - if (psoSource != psoDest) - { - psurfSource = CONTAINING_RECORD(psoSource, SURFACE, SurfObj); - SURFACE_LockBitmapBits(psurfSource); - } - MouseSafetyOnDrawStart(psoSource, InputPoint.x, InputPoint.y, - (InputPoint.x + abs(DestRect->right - DestRect->left)), - (InputPoint.y + abs(DestRect->bottom - DestRect->top))); - } - MouseSafetyOnDrawStart(psoDest, OutputRect.left, OutputRect.top, - OutputRect.right, OutputRect.bottom); - } - - /* No success yet */ - ret = FALSE; - - /* Call the driver's DrvBitBlt if available */ - if (psurfDest->flHooks & HOOK_BITBLT) - { - ret = GDIDEVFUNCS(psoDest).BitBlt( - psoDest, psoSource, MaskSurf, ClipRegion, ColorTranslation, - &OutputRect, &InputPoint, MaskOrigin, pbo, BrushOrigin, - Rop4); - } - - if (! ret) - { - ret = EngBitBlt(psoDest, psoSource, MaskSurf, ClipRegion, ColorTranslation, - &OutputRect, &InputPoint, MaskOrigin, pbo, BrushOrigin, - Rop4); - } - - if (RemoveMouse) - { - MouseSafetyOnDrawEnd(psoDest); - if (UsesSource) - { - MouseSafetyOnDrawEnd(psoSource); - if (psoSource != psoDest) - { - SURFACE_UnlockBitmapBits(psurfSource); - } - } - - SURFACE_UnlockBitmapBits(psurfDest); - } - - return ret; + + /* Don't pass a clipobj with only a single rect */ + if (pco->iDComplexity == DC_RECT) + pco = NULL; + } + + if (ROP4_USES_SOURCE(rop4)) + { + ASSERT(psoSrc); + psurfSrc = CONTAINING_RECORD(psoSrc, SURFACE, SurfObj); + + /* Calculate source rect */ + rclSrc.left = pptlSrc->x + rclClipped.left - prclTrg->left; + rclSrc.top = pptlSrc->y + rclClipped.top - prclTrg->top; + rclSrc.right = rclSrc.left + rclClipped.right - rclClipped.left; + rclSrc.bottom = rclSrc.top + rclClipped.bottom - rclClipped.top; + } + else + { + psoSrc = NULL; + psurfSrc = NULL; + } + + if (bRemoveMouse) + { + SURFACE_LockBitmapBits(psurfTrg); + + if (psoSrc) + { + if (psoSrc != psoTrg) + { + SURFACE_LockBitmapBits(psurfSrc); + } + MouseSafetyOnDrawStart(psoSrc, rclSrc.left, rclSrc.top, + rclSrc.right, rclSrc.bottom); + } + MouseSafetyOnDrawStart(psoTrg, rclClipped.left, rclClipped.top, + rclClipped.right, rclClipped.bottom); + } + + /* Is the target surface device managed? */ + if (psurfTrg->flHooks & HOOK_BITBLT) + { + /* Is the source a different device managed surface? */ + if (psoSrc && psoSrc->hdev != psoTrg->hdev && psurfSrc->flHooks & HOOK_BITBLT) + { + DPRINT1("Need to copy to standard bitmap format!\n"); + ASSERT(FALSE); + } + + pfnBitBlt = GDIDEVFUNCS(psoTrg).BitBlt; + } + + /* Is the source surface device managed? */ + else if (psoSrc && psurfSrc->flHooks & HOOK_BITBLT) + { + pfnBitBlt = GDIDEVFUNCS(psoSrc).BitBlt; + } + else + { + pfnBitBlt = EngBitBlt; + } + + bResult = pfnBitBlt(psoTrg, + psoSrc, + psoMask, + pco, + pxlo, + &rclClipped, + (POINTL*)&rclSrc, + pptlMask, + pbo, + pptlBrush, + rop4); + + // FIXME: cleanup temp surface! + + if (bRemoveMouse) + { + MouseSafetyOnDrawEnd(psoTrg); + if (psoSrc) + { + MouseSafetyOnDrawEnd(psoSrc); + if (psoSrc != psoTrg) + { + SURFACE_UnlockBitmapBits(psurfSrc); + } + } + + SURFACE_UnlockBitmapBits(psurfTrg); + } + + return bResult; } @@ -1057,4 +1003,5 @@ return ret; } + /* EOF */

1 0

[jimtabor] 40494: - Remove NtGdi calls from user32 headers.
by jimtabor＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: jimtabor Date: Tue Apr 14 03:27:52 2009 New Revision: 40494 URL: http://svn.reactos.org/svn/reactos?rev=40494&view=rev Log: - Remove NtGdi calls from user32 headers. Modified: trunk/reactos/dll/win32/user32/include/user32.h Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Tue Apr 14 03:27:52 2009 @@ -43,8 +43,6 @@ #include <pseh/pseh2.h> /* FIXME: Use ntgdi.h then cleanup... */ -HGDIOBJ WINAPI NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj); -BOOL WINAPI NtGdiPatBlt(HDC hdcDst, INT x, INT y, INT cx, INT cy, DWORD rop4); LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *); BOOL FASTCALL IsMetaFile(HDC);

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