Ros-diffs May 2006

ros-diffs@reactos.org

19 participants
377 discussions

[greatlrd] 21876: bug 1468 : patch from w3seek, advapi32: support object ACEs in string functions

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed May 10 13:44:06 2006 New Revision: 21876 URL: http://svn.reactos.ru/svn/reactos?rev=21876&view=rev Log: bug 1468 : patch from w3seek, advapi32: support object ACEs in string functions Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid.… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c Wed May 10 13:44:06 2006 @@ -31,7 +31,7 @@ DWORD value; } ACEFLAG, *LPACEFLAG; -static SID const sidWorld = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; +static const SID sidWorld = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; /* * ACE access rights @@ -55,7 +55,7 @@ static const WCHAR SDDL_AUDIT[] = {'A','U',0}; static const WCHAR SDDL_ALARM[] = {'A','L',0}; static const WCHAR SDDL_OBJECT_AUDIT[] = {'O','U',0}; -static const WCHAR SDDL_OBJECT_ALARMp[] = {'O','L',0}; +static const WCHAR SDDL_OBJECT_ALARM[] = {'O','L',0}; /* * ACE flags @@ -104,18 +104,16 @@ /****************************************************************************** * ParseAceStringType */ -ACEFLAG AceType[] = +static const ACEFLAG AceType[] = { { SDDL_ACCESS_ALLOWED, ACCESS_ALLOWED_ACE_TYPE }, { SDDL_ALARM, SYSTEM_ALARM_ACE_TYPE }, { SDDL_AUDIT, SYSTEM_AUDIT_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 }, }; @@ -123,7 +121,7 @@ { UINT len = 0; LPCWSTR szAcl = *StringAcl; - LPACEFLAG lpaf = AceType; + const ACEFLAG *lpaf = AceType; while (lpaf->wstr && (len = strlenW(lpaf->wstr)) && @@ -141,7 +139,7 @@ /****************************************************************************** * ParseAceStringFlags */ -ACEFLAG AceFlags[] = +static const ACEFLAG AceFlags[] = { { SDDL_CONTAINER_INHERIT, CONTAINER_INHERIT_ACE }, { SDDL_AUDIT_FAILURE, FAILED_ACCESS_ACE_FLAG }, @@ -161,7 +159,7 @@ while (*szAcl != ';') { - LPACEFLAG lpaf = AceFlags; + const ACEFLAG *lpaf = AceFlags; while (lpaf->wstr && (len = strlenW(lpaf->wstr)) && @@ -183,7 +181,7 @@ /****************************************************************************** * ParseAceStringRights */ -ACEFLAG AceRights[] = +static const ACEFLAG AceRights[] = { { SDDL_GENERIC_ALL, GENERIC_ALL }, { SDDL_GENERIC_READ, GENERIC_READ }, @@ -221,7 +219,7 @@ { while (*szAcl != ';') { - LPACEFLAG lpaf = AceRights; + const ACEFLAG *lpaf = AceRights; while (lpaf->wstr && (len = strlenW(lpaf->wstr)) &&

18 years, 7 months

[greatlrd] 21875: bug 1467 : patch from w3seek, ACLs: Implement audit functions

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed May 10 13:32:23 2006 New Revision: 21875 URL: http://svn.reactos.ru/svn/reactos?rev=21875&view=rev Log: bug 1467 : patch from w3seek, ACLs: Implement audit functions Modified: trunk/reactos/dll/ntdll/def/ntdll.def trunk/reactos/dll/win32/advapi32/advapi32.h trunk/reactos/dll/win32/advapi32/sec/ac.c trunk/reactos/dll/win32/advapi32/sec/sec.c trunk/reactos/dll/win32/ntmarta/ntmarta.c trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/winnt.h trunk/reactos/lib/rtl/acl.c Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?rev… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def Wed May 10 13:32:23 2006 @@ -292,14 +292,17 @@ RtlAcquireResourceShared@8 RtlAddAccessAllowedAce@16 RtlAddAccessAllowedAceEx@20 +RtlAddAccessAllowedObjectAce@28 RtlAddAccessDeniedAce@16 RtlAddAccessDeniedAceEx@20 +RtlAddAccessDeniedObjectAce@28 RtlAddAce@20 ;RtlAddActionToRXact RtlAddAtomToAtomTable@12 ;RtlAddAttributeActionToRXact RtlAddAuditAccessAce@24 RtlAddAuditAccessAceEx@28 +RtlAddAuditAccessObjectAce@36 ;RtlAddCompoundAce RtlAddRange@36 RtlAddVectoredExceptionHandler@8 Modified: trunk/reactos/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi32… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.h (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.h Wed May 10 13:32:23 2006 @@ -17,6 +17,7 @@ #define WIN32_NO_STATUS #include <windows.h> #include <accctrl.h> +#include <aclapi.h> #include <sddl.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> Modified: trunk/reactos/dll/win32/advapi32/sec/ac.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/ac.c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/ac.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/ac.c Wed May 10 13:32:23 2006 @@ -166,7 +166,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -179,8 +179,22 @@ GUID* InheritedObjectTypeGuid, PSID pSid) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; + NTSTATUS Status; + + Status = RtlAddAccessAllowedObjectAce(pAcl, + dwAceRevision, + AceFlags, + AccessMask, + ObjectTypeGuid, + InheritedObjectTypeGuid, + pSid); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; } @@ -240,7 +254,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -253,8 +267,22 @@ GUID* InheritedObjectTypeGuid, PSID pSid) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; + NTSTATUS Status; + + Status = RtlAddAccessDeniedObjectAce(pAcl, + dwAceRevision, + AceFlags, + AccessMask, + ObjectTypeGuid, + InheritedObjectTypeGuid, + pSid); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; } @@ -352,7 +380,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -367,8 +395,24 @@ BOOL bAuditSuccess, BOOL bAuditFailure) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; + NTSTATUS Status; + + Status = RtlAddAuditAccessObjectAce(pAcl, + dwAceRevision, + AceFlags, + AccessMask, + ObjectTypeGuid, + InheritedObjectTypeGuid, + pSid, + bAuditSuccess, + bAuditFailure); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; } @@ -554,6 +598,385 @@ } +static DWORD +InternalTrusteeAToW(IN PTRUSTEE_A pTrusteeA, + OUT PTRUSTEE_W *pTrusteeW) +{ + TRUSTEE_FORM TrusteeForm; + INT BufferSize = 0; + PSTR lpStr; + DWORD ErrorCode = ERROR_SUCCESS; + + ASSERT(sizeof(TRUSTEE_W) == sizeof(TRUSTEE_A)); + + TrusteeForm = GetTrusteeForm(pTrusteeA); + switch (TrusteeForm) + { + case TRUSTEE_IS_NAME: + { + lpStr = GetTrusteeName(pTrusteeA); + if (lpStr != NULL) + BufferSize = strlen(lpStr) + 1; + + *pTrusteeW = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + sizeof(TRUSTEE_W) + (BufferSize * sizeof(WCHAR))); + if (*pTrusteeW != NULL) + { + RtlCopyMemory(*pTrusteeW, + pTrusteeA, + FIELD_OFFSET(TRUSTEE_A, + ptstrName)); + + if (lpStr != NULL) + { + (*pTrusteeW)->ptstrName = (PWSTR)((*pTrusteeW) + 1); + + /* convert the trustee's name */ + if (MultiByteToWideChar(CP_ACP, + 0, + lpStr, + -1, + (*pTrusteeW)->ptstrName, + BufferSize) == 0) + { + goto ConvertErr; + } + } + else + { + RtlFreeHeap(RtlGetProcessHeap(), + 0, + *pTrusteeW); + goto NothingToConvert; + } + } + else + ErrorCode = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + case TRUSTEE_IS_OBJECTS_AND_NAME: + { + POBJECTS_AND_NAME_A oanA = (POBJECTS_AND_NAME_A)GetTrusteeNameA(pTrusteeA); + POBJECTS_AND_NAME_W oan; + PWSTR StrBuf; + + /* calculate the size needed */ + if ((oanA->ObjectsPresent & ACE_INHERITED_OBJECT_TYPE_PRESENT) && + oanA->InheritedObjectTypeName != NULL) + { + BufferSize = strlen(oanA->InheritedObjectTypeName) + 1; + } + if (oanA->ptstrName != NULL) + { + BufferSize += strlen(oanA->ptstrName) + 1; + } + + *pTrusteeW = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + sizeof(TRUSTEE_W) + sizeof(OBJECTS_AND_NAME_W) + + (BufferSize * sizeof(WCHAR))); + + if (*pTrusteeW != NULL) + { + oan = (POBJECTS_AND_NAME_W)((*pTrusteeW) + 1); + StrBuf = (PWSTR)(oan + 1); + + /* copy over the parts of the TRUSTEE structure that don't need + to be touched */ + RtlCopyMemory(*pTrusteeW, + pTrusteeA, + FIELD_OFFSET(TRUSTEE_A, + ptstrName)); + + (*pTrusteeW)->ptstrName = (LPWSTR)oan; + + /* convert the OBJECTS_AND_NAME_A structure */ + oan->ObjectsPresent = oanA->ObjectsPresent; + oan->ObjectType = oanA->ObjectType; + + if ((oanA->ObjectsPresent & ACE_INHERITED_OBJECT_TYPE_PRESENT) && + oanA->InheritedObjectTypeName != NULL) + { + /* convert inherited object type name */ + BufferSize = strlen(oanA->InheritedObjectTypeName) + 1; + + if (MultiByteToWideChar(CP_ACP, + 0, + oanA->InheritedObjectTypeName, + -1, + StrBuf, + BufferSize) == 0) + { + goto ConvertErr; + } + oan->InheritedObjectTypeName = StrBuf; + + StrBuf += BufferSize; + } + else + oan->InheritedObjectTypeName = NULL; + + if (oanA->ptstrName != NULL) + { + /* convert the trustee name */ + BufferSize = strlen(oanA->ptstrName) + 1; + + if (MultiByteToWideChar(CP_ACP, + 0, + oanA->ptstrName, + -1, + StrBuf, + BufferSize) == 0) + { +ConvertErr: + ErrorCode = GetLastError(); + + /* cleanup */ + RtlFreeHeap(RtlGetProcessHeap(), + 0, + *pTrusteeW); + + return ErrorCode; + } + oan->ptstrName = StrBuf; + } + else + oan->ptstrName = NULL; + } + else + ErrorCode = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + default: + { +NothingToConvert: + /* no need to convert anything to unicode */ + *pTrusteeW = (PTRUSTEE_W)pTrusteeA; + break; + } + } + + return ErrorCode; +} + + +static __inline VOID +InternalFreeConvertedTrustee(IN PTRUSTEE_W pTrusteeW, + IN PTRUSTEE_A pTrusteeA) +{ + if ((PVOID)pTrusteeW != (PVOID)pTrusteeA) + { + RtlFreeHeap(RtlGetProcessHeap(), + 0, + pTrusteeW); + } +} + + +static DWORD +InternalExplicitAccessAToW(IN ULONG cCountOfExplicitEntries, + IN PEXPLICIT_ACCESS_A pListOfExplicitEntriesA, + OUT PEXPLICIT_ACCESS_W *pListOfExplicitEntriesW) +{ + TRUSTEE_FORM TrusteeForm; + SIZE_T Size; + ULONG i; + ULONG ObjectsAndNameCount = 0; + PEXPLICIT_ACCESS_W peaw = NULL; + DWORD ErrorCode = ERROR_SUCCESS; + LPSTR lpStr; + + /* NOTE: This code assumes that the size of the TRUSTEE_A and TRUSTEE_W structure matches! */ + ASSERT(sizeof(TRUSTEE_A) == sizeof(TRUSTEE_W)); + + if (cCountOfExplicitEntries != 0) + { + /* calculate the size needed */ + Size = cCountOfExplicitEntries * sizeof(EXPLICIT_ACCESS_W); + for (i = 0; i != cCountOfExplicitEntries; i++) + { + TrusteeForm = GetTrusteeForm(&pListOfExplicitEntriesA[i].Trustee); + + switch (TrusteeForm) + { + case TRUSTEE_IS_NAME: + { + lpStr = GetTrusteeNameA(&pListOfExplicitEntriesA[i].Trustee); + if (lpStr != NULL) + Size += (strlen(lpStr) + 1) * sizeof(WCHAR); + break; + } + + case TRUSTEE_IS_OBJECTS_AND_NAME: + { + POBJECTS_AND_NAME_A oan = (POBJECTS_AND_NAME_A)GetTrusteeNameA(&pListOfExplicitEntriesA[i].Trustee); + + if ((oan->ObjectsPresent & ACE_INHERITED_OBJECT_TYPE_PRESENT) && + oan->InheritedObjectTypeName != NULL) + { + Size += (strlen(oan->InheritedObjectTypeName) + 1) * sizeof(WCHAR); + } + + if (oan->ptstrName != NULL) + Size += (strlen(oan->ptstrName) + 1) * sizeof(WCHAR); + + ObjectsAndNameCount++; + break; + } + + default: + break; + } + } + + /* allocate the array */ + peaw = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + Size); + if (peaw != NULL) + { + INT BufferSize; + POBJECTS_AND_NAME_W oan = (POBJECTS_AND_NAME_W)(peaw + cCountOfExplicitEntries); + LPWSTR StrBuf = (LPWSTR)(oan + ObjectsAndNameCount); + + /* convert the array to unicode */ + for (i = 0; i != cCountOfExplicitEntries; i++) + { + peaw[i].grfAccessPermissions = pListOfExplicitEntriesA[i].grfAccessPermissions; + peaw[i].grfAccessMode = pListOfExplicitEntriesA[i].grfAccessMode; + peaw[i].grfInheritance = pListOfExplicitEntriesA[i].grfInheritance; + + /* convert or copy the TRUSTEE structure */ + TrusteeForm = GetTrusteeForm(&pListOfExplicitEntriesA[i].Trustee); + switch (TrusteeForm) + { + case TRUSTEE_IS_NAME: + { + lpStr = GetTrusteeNameA(&pListOfExplicitEntriesA[i].Trustee); + if (lpStr != NULL) + { + /* convert the trustee name */ + BufferSize = strlen(lpStr) + 1; + + if (MultiByteToWideChar(CP_ACP, + 0, + lpStr, + -1, + StrBuf, + BufferSize) == 0) + { + goto ConvertErr; + } + peaw[i].Trustee.ptstrName = StrBuf; + + StrBuf += BufferSize; + } + else + goto RawTrusteeCopy; + + break; + } + + case TRUSTEE_IS_OBJECTS_AND_NAME: + { + POBJECTS_AND_NAME_A oanA = (POBJECTS_AND_NAME_A)GetTrusteeNameA(&pListOfExplicitEntriesA[i].Trustee); + + /* copy over the parts of the TRUSTEE structure that don't need + to be touched */ + RtlCopyMemory(&peaw[i].Trustee, + &pListOfExplicitEntriesA[i].Trustee, + FIELD_OFFSET(TRUSTEE_A, + ptstrName)); + + peaw[i].Trustee.ptstrName = (LPWSTR)oan; + + /* convert the OBJECTS_AND_NAME_A structure */ + oan->ObjectsPresent = oanA->ObjectsPresent; + oan->ObjectType = oanA->ObjectType; + + if ((oanA->ObjectsPresent & ACE_INHERITED_OBJECT_TYPE_PRESENT) && + oanA->InheritedObjectTypeName != NULL) + { + /* convert inherited object type name */ + BufferSize = strlen(oanA->InheritedObjectTypeName) + 1; + + if (MultiByteToWideChar(CP_ACP, + 0, + oanA->InheritedObjectTypeName, + -1, + StrBuf, + BufferSize) == 0) + { + goto ConvertErr; + } + oan->InheritedObjectTypeName = StrBuf; + + StrBuf += BufferSize; + } + else + oan->InheritedObjectTypeName = NULL; + + if (oanA->ptstrName != NULL) + { + /* convert the trustee name */ + BufferSize = strlen(oanA->ptstrName) + 1; + + if (MultiByteToWideChar(CP_ACP, + 0, + oanA->ptstrName, + -1, + StrBuf, + BufferSize) == 0) + { +ConvertErr: + ErrorCode = GetLastError(); + + /* cleanup */ + RtlFreeHeap(RtlGetProcessHeap(), + 0, + peaw); + + return ErrorCode; + } + oan->ptstrName = StrBuf; + + StrBuf += BufferSize; + } + else + oan->ptstrName = NULL; + + /* move on to the next OBJECTS_AND_NAME_A structure */ + oan++; + break; + } + + default: + { +RawTrusteeCopy: + /* just copy over the TRUSTEE structure, they don't contain any + ansi/unicode specific data */ + RtlCopyMemory(&peaw[i].Trustee, + &pListOfExplicitEntriesA[i].Trustee, + sizeof(TRUSTEE_A)); + break; + } + } + } + + ASSERT(ErrorCode == ERROR_SUCCESS); + *pListOfExplicitEntriesW = peaw; + } + else + ErrorCode = ERROR_NOT_ENOUGH_MEMORY; + } + + return ErrorCode; +} + + /* * @implemented */ @@ -565,102 +988,24 @@ PACL OldAcl, PACL* NewAcl) { - PEXPLICIT_ACCESS_W ListOfExplicitEntriesW; - ULONG i; + PEXPLICIT_ACCESS_W ListOfExplicitEntriesW = NULL; DWORD ErrorCode; - if (cCountOfExplicitEntries != 0) + ErrorCode = InternalExplicitAccessAToW(cCountOfExplicitEntries, + pListOfExplicitEntries, + &ListOfExplicitEntriesW); + + if (ErrorCode == ERROR_SUCCESS) { - ListOfExplicitEntriesW = HeapAlloc(GetProcessHeap(), - 0, - cCountOfExplicitEntries * sizeof(EXPLICIT_ACCESS_W)); - if (ListOfExplicitEntriesW != NULL) - { - /* directly copy the array, this works as the size of the EXPLICIT_ACCESS_A - structure matches the size of the EXPLICIT_ACCESS_W version */ - ASSERT(sizeof(EXPLICIT_ACCESS_A) == sizeof(EXPLICIT_ACCESS_W)); - - RtlCopyMemory(ListOfExplicitEntriesW, - pListOfExplicitEntries, - cCountOfExplicitEntries * sizeof(EXPLICIT_ACCESS_W)); - - /* convert the trustee names if required */ - for (i = 0; i != cCountOfExplicitEntries; i++) - { - if (pListOfExplicitEntries[i].Trustee.TrusteeForm == TRUSTEE_IS_NAME) - { - UINT BufCount = strlen(pListOfExplicitEntries[i].Trustee.ptstrName) + 1; - ListOfExplicitEntriesW[i].Trustee.ptstrName = - (LPWSTR)HeapAlloc(GetProcessHeap(), - 0, - BufCount * sizeof(WCHAR)); - - if (ListOfExplicitEntriesW[i].Trustee.ptstrName == NULL || - MultiByteToWideChar(CP_ACP, - 0, - pListOfExplicitEntries[i].Trustee.ptstrName, - -1, - ListOfExplicitEntriesW[i].Trustee.ptstrName, - BufCount) == 0) - { - /* failed to allocate enough momory for the strings or failed to - convert the ansi string to unicode, then fail and free all - allocated memory */ - - ErrorCode = GetLastError(); - - do - { - if (ListOfExplicitEntriesW[i].Trustee.TrusteeForm == TRUSTEE_IS_NAME && - ListOfExplicitEntriesW[i].Trustee.ptstrName != NULL) - { - HeapFree(GetProcessHeap(), - 0, - ListOfExplicitEntriesW[i].Trustee.ptstrName); - } - } while (i-- != 0); - - /* free the allocated array */ - HeapFree(GetProcessHeap(), - 0, - ListOfExplicitEntriesW); - - return ErrorCode; - } - } - } - } - else - { - return GetLastError(); - } - } - else - ListOfExplicitEntriesW = NULL; - - ErrorCode = SetEntriesInAclW(cCountOfExplicitEntries, - ListOfExplicitEntriesW, - OldAcl, - NewAcl); - - /* free the strings */ - if (ListOfExplicitEntriesW != NULL) - { - /* free the converted strings */ - for (i = 0; i != cCountOfExplicitEntries; i++) - { - if (ListOfExplicitEntriesW[i].Trustee.TrusteeForm == TRUSTEE_IS_NAME) - { - HeapFree(GetProcessHeap(), - 0, - ListOfExplicitEntriesW[i].Trustee.ptstrName); - } - } + ErrorCode = SetEntriesInAclW(cCountOfExplicitEntries, + ListOfExplicitEntriesW, + OldAcl, + NewAcl); /* free the allocated array */ - HeapFree(GetProcessHeap(), - 0, - ListOfExplicitEntriesW); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + ListOfExplicitEntriesW); } return ErrorCode; @@ -708,7 +1053,7 @@ /* - * @unimplemented + * @implemented */ DWORD STDCALL @@ -716,8 +1061,24 @@ IN PTRUSTEE_A pTrustee, OUT PACCESS_MASK pAccessRights) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; + PTRUSTEE_W pTrusteeW = NULL; + DWORD ErrorCode; + + ErrorCode = InternalTrusteeAToW(pTrustee, + &pTrusteeW); + if (ErrorCode == ERROR_SUCCESS) + { + ErrorCode = GetEffectiveRightsFromAclW(pacl, + pTrusteeW, + pAccessRights); + + InternalFreeConvertedTrustee(pTrusteeW, + pTrustee); + } + else + ErrorCode = ERROR_NOT_ENOUGH_MEMORY; + + return ErrorCode; } @@ -737,7 +1098,7 @@ /* - * @unimplemented + * @implemented */ DWORD STDCALL @@ -746,8 +1107,25 @@ OUT PACCESS_MASK pSuccessfulAuditedRights, OUT PACCESS_MASK pFailedAuditRights) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; + PTRUSTEE_W pTrusteeW = NULL; + DWORD ErrorCode; + + ErrorCode = InternalTrusteeAToW(pTrustee, + &pTrusteeW); + if (ErrorCode == ERROR_SUCCESS) + { + ErrorCode = GetAuditedPermissionsFromAclW(pacl, + pTrusteeW, + pSuccessfulAuditedRights, + pFailedAuditRights); + + InternalFreeConvertedTrustee(pTrusteeW, + pTrustee); + } + else + ErrorCode = ERROR_NOT_ENOUGH_MEMORY; + + return ErrorCode; } /* EOF */ Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec.… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sec.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/sec.c Wed May 10 13:32:23 2006 @@ -490,9 +490,9 @@ BuildSecurityDescriptorW(IN PTRUSTEE_W pOwner OPTIONAL, IN PTRUSTEE_W pGroup OPTIONAL, IN ULONG cCountOfAccessEntries, - IN PEXPLICIT_ACCESS pListOfAccessEntries OPTIONAL, + IN PEXPLICIT_ACCESS_W pListOfAccessEntries OPTIONAL, IN ULONG cCountOfAuditEntries, - IN PEXPLICIT_ACCESS pListOfAuditEntries OPTIONAL, + IN PEXPLICIT_ACCESS_W pListOfAuditEntries OPTIONAL, IN PSECURITY_DESCRIPTOR pOldSD OPTIONAL, OUT PULONG pSizeNewSD, OUT PSECURITY_DESCRIPTOR* pNewSD) @@ -510,9 +510,9 @@ BuildSecurityDescriptorA(IN PTRUSTEE_A pOwner OPTIONAL, IN PTRUSTEE_A pGroup OPTIONAL, IN ULONG cCountOfAccessEntries, - IN PEXPLICIT_ACCESS pListOfAccessEntries OPTIONAL, + IN PEXPLICIT_ACCESS_A pListOfAccessEntries OPTIONAL, IN ULONG cCountOfAuditEntries, - IN PEXPLICIT_ACCESS pListOfAuditEntries OPTIONAL, + IN PEXPLICIT_ACCESS_A pListOfAuditEntries OPTIONAL, IN PSECURITY_DESCRIPTOR pOldSD OPTIONAL, OUT PULONG pSizeNewSD, OUT PSECURITY_DESCRIPTOR* pNewSD) Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.c… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c Wed May 10 13:32:23 2006 @@ -155,6 +155,136 @@ AccpGetAceAccessMask(IN PACE_HEADER AceHeader) { return *((PACCESS_MASK)(AceHeader + 1)); +} + +static BOOL +AccpIsObjectAce(IN PACE_HEADER AceHeader) +{ + BOOL Ret; + + switch (AceHeader->AceType) + { + case ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE: + case ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE: + case ACCESS_ALLOWED_OBJECT_ACE_TYPE: + case ACCESS_DENIED_OBJECT_ACE_TYPE: + case SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE: + case SYSTEM_AUDIT_OBJECT_ACE_TYPE: + Ret = TRUE; + break; + + default: + Ret = FALSE; + break; + } + + return Ret; +} + +static GUID* +AccpGetObjectAceObjectType(IN PACE_HEADER AceHeader) +{ + GUID *ObjectType = NULL; + + switch (AceHeader->AceType) + { + case ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE: + case ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE: + { + PACCESS_ALLOWED_CALLBACK_OBJECT_ACE Ace = (PACCESS_ALLOWED_CALLBACK_OBJECT_ACE)AceHeader; + if (Ace->Flags & ACE_OBJECT_TYPE_PRESENT) + ObjectType = &Ace->ObjectType; + break; + } + case ACCESS_ALLOWED_OBJECT_ACE_TYPE: + case ACCESS_DENIED_OBJECT_ACE_TYPE: + { + PACCESS_ALLOWED_OBJECT_ACE Ace = (PACCESS_ALLOWED_OBJECT_ACE)AceHeader; + if (Ace->Flags & ACE_OBJECT_TYPE_PRESENT) + ObjectType = &Ace->ObjectType; + break; + } + + case SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE: + { + PSYSTEM_AUDIT_CALLBACK_OBJECT_ACE Ace = (PSYSTEM_AUDIT_CALLBACK_OBJECT_ACE)AceHeader; + if (Ace->Flags & ACE_OBJECT_TYPE_PRESENT) + ObjectType = &Ace->ObjectType; + break; + } + case SYSTEM_AUDIT_OBJECT_ACE_TYPE: + { + PSYSTEM_AUDIT_OBJECT_ACE Ace = (PSYSTEM_AUDIT_OBJECT_ACE)AceHeader; + if (Ace->Flags & ACE_OBJECT_TYPE_PRESENT) + ObjectType = &Ace->ObjectType; + break; + } + } + + return ObjectType; +} + +static GUID* +AccpGetObjectAceInheritedObjectType(IN PACE_HEADER AceHeader) +{ + GUID *ObjectType = NULL; + + switch (AceHeader->AceType) + { + case ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE: + case ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE: + { + PACCESS_ALLOWED_CALLBACK_OBJECT_ACE Ace = (PACCESS_ALLOWED_CALLBACK_OBJECT_ACE)AceHeader; + if (Ace->Flags & ACE_INHERITED_OBJECT_TYPE_PRESENT) + { + if (Ace->Flags & ACE_OBJECT_TYPE_PRESENT) + ObjectType = &Ace->InheritedObjectType; + else + ObjectType = &Ace->ObjectType; + } + break; + } + case ACCESS_ALLOWED_OBJECT_ACE_TYPE: + case ACCESS_DENIED_OBJECT_ACE_TYPE: + { + PACCESS_ALLOWED_OBJECT_ACE Ace = (PACCESS_ALLOWED_OBJECT_ACE)AceHeader; + if (Ace->Flags & ACE_INHERITED_OBJECT_TYPE_PRESENT) + { + if (Ace->Flags & ACE_OBJECT_TYPE_PRESENT) + ObjectType = &Ace->InheritedObjectType; + else + ObjectType = &Ace->ObjectType; + } + break; + } + + case SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE: + { + PSYSTEM_AUDIT_CALLBACK_OBJECT_ACE Ace = (PSYSTEM_AUDIT_CALLBACK_OBJECT_ACE)AceHeader; + if (Ace->Flags & ACE_INHERITED_OBJECT_TYPE_PRESENT) + { + if (Ace->Flags & ACE_OBJECT_TYPE_PRESENT) + ObjectType = &Ace->InheritedObjectType; + else + ObjectType = &Ace->ObjectType; + } + break; + } + case SYSTEM_AUDIT_OBJECT_ACE_TYPE: + { + PSYSTEM_AUDIT_OBJECT_ACE Ace = (PSYSTEM_AUDIT_OBJECT_ACE)AceHeader; + if (Ace->Flags & ACE_INHERITED_OBJECT_TYPE_PRESENT) + { + if (Ace->Flags & ACE_OBJECT_TYPE_PRESENT) + ObjectType = &Ace->InheritedObjectType; + else + ObjectType = &Ace->ObjectType; + } + break; + } + } + + return ObjectType; } @@ -925,6 +1055,8 @@ { PACE_HEADER AceHeader; PSID Sid, SidTarget; + ULONG ObjectAceCount = 0; + POBJECTS_AND_SID ObjSid; SIZE_T Size; PEXPLICIT_ACCESS_W peaw; DWORD LastErr, SidLen; @@ -947,9 +1079,14 @@ { Sid = AccpGetAceSid(AceHeader); Size += GetLengthSid(Sid); - /* FIXME - take size of opaque data in account? */ + + if (AccpIsObjectAce(AceHeader)) + ObjectAceCount++; + AceIndex++; } + + Size += ObjectAceCount * sizeof(OBJECTS_AND_SID); ASSERT(pacl->AceCount == AceIndex); @@ -959,7 +1096,8 @@ if (peaw != NULL) { AceIndex = 0; - SidTarget = (PSID)(peaw + pacl->AceCount); + ObjSid = (POBJECTS_AND_SID)(peaw + pacl->AceCount); + SidTarget = (PSID)(ObjSid + ObjectAceCount); /* initialize the array */ while (GetAce(pacl, @@ -977,8 +1115,20 @@ SidTarget, Sid)) { - BuildTrusteeWithSid(&peaw[AceIndex].Trustee, - SidTarget); + if (AccpIsObjectAce(AceHeader)) + { + BuildTrusteeWithObjectsAndSid(&peaw[AceIndex].Trustee, + ObjSid++, + AccpGetObjectAceObjectType(AceHeader), + AccpGetObjectAceInheritedObjectType(AceHeader), + SidTarget); + } + else + { + BuildTrusteeWithSid(&peaw[AceIndex].Trustee, + SidTarget); + } + SidTarget = (PSID)((ULONG_PTR)SidTarget + SidLen); } else Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Wed May 10 13:32:23 2006 @@ -458,6 +458,19 @@ NTSYSAPI NTSTATUS NTAPI +RtlAddAccessAllowedObjectAce( + IN OUT PACL pAcl, + IN ULONG dwAceRevision, + IN ULONG AceFlags, + IN ULONG AccessMask, + IN GUID *ObjectTypeGuid OPTIONAL, + IN GUID *InheritedObjectTypeGuid OPTIONAL, + IN PSID pSid +); + +NTSYSAPI +NTSTATUS +NTAPI RtlAddAccessDeniedAce( PACL Acl, ULONG Revision, @@ -474,6 +487,42 @@ IN ULONG Flags, IN ACCESS_MASK AccessMask, IN PSID Sid +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlAddAccessDeniedObjectAce( + IN OUT PACL pAcl, + IN ULONG dwAceRevision, + IN ULONG AceFlags, + IN ULONG AccessMask, + IN GUID *ObjectTypeGuid OPTIONAL, + IN GUID *InheritedObjectTypeGuid OPTIONAL, + IN PSID pSid +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlAddAce( + PACL Acl, + ULONG AceRevision, + ULONG StartingAceIndex, + PVOID AceList, + ULONG AceListLength +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlAddAuditAccessAce( + PACL Acl, + ULONG Revision, + ACCESS_MASK AccessMask, + PSID Sid, + BOOLEAN Success, + BOOLEAN Failure ); NTSYSAPI @@ -492,24 +541,16 @@ NTSYSAPI NTSTATUS NTAPI -RtlAddAce( - PACL Acl, - ULONG AceRevision, - ULONG StartingAceIndex, - PVOID AceList, - ULONG AceListLength -); - -NTSYSAPI -NTSTATUS -NTAPI -RtlAddAuditAccessAce( - PACL Acl, - ULONG Revision, - ACCESS_MASK AccessMask, - PSID Sid, - BOOLEAN Success, - BOOLEAN Failure +RtlAddAuditAccessObjectAce( + IN OUT PACL Acl, + IN ULONG Revision, + IN ULONG Flags, + IN ACCESS_MASK AccessMask, + IN GUID *ObjectTypeGuid OPTIONAL, + IN GUID *InheritedObjectTypeGuid OPTIONAL, + IN PSID Sid, + IN BOOLEAN Success, + IN BOOLEAN Failure ); NTSYSAPI Modified: trunk/reactos/include/winnt.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/winnt.h?rev=21875&r… ============================================================================== --- trunk/reactos/include/winnt.h (original) +++ trunk/reactos/include/winnt.h Wed May 10 13:32:23 2006 @@ -225,7 +225,7 @@ #define NO_PROPAGATE_INHERIT_ACE 4 #define INHERIT_ONLY_ACE 8 #define INHERITED_ACE 10 -#define VALID_INHERIT_FLAGS 16 +#define VALID_INHERIT_FLAGS 0x1F #define SUCCESSFUL_ACCESS_ACE_FLAG 64 #define FAILED_ACCESS_ACE_FLAG 128 #define DELETE 0x00010000L Modified: trunk/reactos/lib/rtl/acl.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/acl.c?rev=21875&r1=… ============================================================================== --- trunk/reactos/lib/rtl/acl.c (original) +++ trunk/reactos/lib/rtl/acl.c Wed May 10 13:32:23 2006 @@ -103,13 +103,39 @@ ULONG Revision, ULONG Flags, ACCESS_MASK AccessMask, + GUID *ObjectTypeGuid OPTIONAL, + GUID *InheritedObjectTypeGuid OPTIONAL, PSID Sid, ULONG Type) { PACE Ace; - ULONG InvalidFlags; - - PAGED_CODE_RTL(); + PSID SidStart; + ULONG AceSize, InvalidFlags; + ULONG AceObjectFlags = 0; + + PAGED_CODE_RTL(); + +#if DBG + /* check if RtlpAddKnownAce was called incorrectly */ + if (ObjectTypeGuid != NULL || InheritedObjectTypeGuid != NULL) + { + ASSERT(Type == ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE || + Type == ACCESS_ALLOWED_OBJECT_ACE_TYPE || + Type == ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE || + Type == ACCESS_DENIED_OBJECT_ACE_TYPE || + Type == SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE || + Type == SYSTEM_AUDIT_OBJECT_ACE_TYPE); + } + else + { + ASSERT(Type != ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE && + Type != ACCESS_ALLOWED_OBJECT_ACE_TYPE && + Type != ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE && + Type != ACCESS_DENIED_OBJECT_ACE_TYPE && + Type != SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE && + Type != SYSTEM_AUDIT_OBJECT_ACE_TYPE); + } +#endif if (!RtlValidSid(Sid)) { @@ -126,11 +152,17 @@ } /* Validate the flags */ - if (Type == SYSTEM_AUDIT_ACE_TYPE) + if (Type == SYSTEM_AUDIT_ACE_TYPE || + Type == SYSTEM_AUDIT_OBJECT_ACE_TYPE || + Type == SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE) + { InvalidFlags = Flags & ~(VALID_INHERIT_FLAGS | SUCCESSFUL_ACCESS_ACE_FLAG | FAILED_ACCESS_ACE_FLAG); + } else + { InvalidFlags = Flags & ~VALID_INHERIT_FLAGS; + } if (InvalidFlags != 0) { @@ -145,16 +177,69 @@ { return(STATUS_ALLOTTED_SPACE_EXCEEDED); } - if ((ULONG_PTR)Ace + RtlLengthSid(Sid) + sizeof(ACE) > + + /* Calculate the size of the ACE */ + AceSize = RtlLengthSid(Sid) + sizeof(ACE); + if (ObjectTypeGuid != NULL) + { + AceObjectFlags |= ACE_OBJECT_TYPE_PRESENT; + AceSize += sizeof(GUID); + } + if (InheritedObjectTypeGuid != NULL) + { + AceObjectFlags |= ACE_INHERITED_OBJECT_TYPE_PRESENT; + AceSize += sizeof(GUID); + } + + if (AceObjectFlags != 0) + { + /* Don't forget the ACE object flags + (corresponds to the Flags field in the *_OBJECT_ACE structures) */ + AceSize += sizeof(ULONG); + } + + if ((ULONG_PTR)Ace + AceSize > (ULONG_PTR)Acl + Acl->AclSize) { return(STATUS_ALLOTTED_SPACE_EXCEEDED); } + + /* initialize the header and common fields */ Ace->Header.AceFlags = Flags; Ace->Header.AceType = Type; - Ace->Header.AceSize = RtlLengthSid(Sid) + sizeof(ACE); + Ace->Header.AceSize = (WORD)AceSize; Ace->AccessMask = AccessMask; - RtlCopySid(RtlLengthSid(Sid), (PSID)(Ace + 1), Sid); + + if (AceObjectFlags != 0) + { + /* Write the ACE flags to the ACE + (corresponds to the Flags field in the *_OBJECT_ACE structures) */ + *(PULONG)(Ace + 1) = AceObjectFlags; + SidStart = (PSID)((ULONG_PTR)(Ace + 1) + sizeof(ULONG)); + } + else + SidStart = (PSID)(Ace + 1); + + /* copy the GUIDs */ + if (ObjectTypeGuid != NULL) + { + RtlCopyMemory(SidStart, + ObjectTypeGuid, + sizeof(GUID)); + SidStart = (PSID)((ULONG_PTR)SidStart + sizeof(GUID)); + } + if (InheritedObjectTypeGuid != NULL) + { + RtlCopyMemory(SidStart, + InheritedObjectTypeGuid, + sizeof(GUID)); + SidStart = (PSID)((ULONG_PTR)SidStart + sizeof(GUID)); + } + + /* copy the SID */ + RtlCopySid(RtlLengthSid(Sid), + SidStart, + Sid); Acl->AceCount++; Acl->AclRevision = Revision; return(STATUS_SUCCESS); @@ -176,6 +261,8 @@ Revision, 0, AccessMask, + NULL, + NULL, Sid, ACCESS_ALLOWED_ACE_TYPE); } @@ -197,8 +284,43 @@ Revision, Flags, AccessMask, + NULL, + NULL, Sid, ACCESS_ALLOWED_ACE_TYPE); +} + + +/* + * @implemented + */ +NTSTATUS NTAPI +RtlAddAccessAllowedObjectAce (IN OUT PACL Acl, + IN ULONG Revision, + IN ULONG Flags, + IN ACCESS_MASK AccessMask, + IN GUID *ObjectTypeGuid OPTIONAL, + IN GUID *InheritedObjectTypeGuid OPTIONAL, + IN PSID Sid) +{ + ULONG Type; + + PAGED_CODE_RTL(); + + /* make sure we call RtlpAddKnownAce correctly */ + if (ObjectTypeGuid != NULL || InheritedObjectTypeGuid != NULL) + Type = ACCESS_ALLOWED_OBJECT_ACE_TYPE; + else + Type = ACCESS_ALLOWED_ACE_TYPE; + + return RtlpAddKnownAce (Acl, + Revision, + Flags, + AccessMask, + ObjectTypeGuid, + InheritedObjectTypeGuid, + Sid, + Type); } @@ -217,6 +339,8 @@ Revision, 0, AccessMask, + NULL, + NULL, Sid, ACCESS_DENIED_ACE_TYPE); } @@ -238,8 +362,43 @@ Revision, Flags, AccessMask, + NULL, + NULL, Sid, ACCESS_DENIED_ACE_TYPE); +} + + +/* + * @implemented + */ +NTSTATUS NTAPI +RtlAddAccessDeniedObjectAce (IN OUT PACL Acl, + IN ULONG Revision, + IN ULONG Flags, + IN ACCESS_MASK AccessMask, + IN GUID *ObjectTypeGuid OPTIONAL, + IN GUID *InheritedObjectTypeGuid OPTIONAL, + IN PSID Sid) +{ + ULONG Type; + + PAGED_CODE_RTL(); + + /* make sure we call RtlpAddKnownAce correctly */ + if (ObjectTypeGuid != NULL || InheritedObjectTypeGuid != NULL) + Type = ACCESS_DENIED_OBJECT_ACE_TYPE; + else + Type = ACCESS_DENIED_ACE_TYPE; + + return RtlpAddKnownAce (Acl, + Revision, + Flags, + AccessMask, + ObjectTypeGuid, + InheritedObjectTypeGuid, + Sid, + Type); } @@ -363,6 +522,8 @@ Revision, Flags, AccessMask, + NULL, + NULL, Sid, SYSTEM_AUDIT_ACE_TYPE); } @@ -394,8 +555,53 @@ Revision, Flags, AccessMask, + NULL, + NULL, Sid, SYSTEM_AUDIT_ACE_TYPE); +} + + +/* + * @implemented + */ +NTSTATUS NTAPI +RtlAddAuditAccessObjectAce(PACL Acl, + ULONG Revision, + ULONG Flags, + ACCESS_MASK AccessMask, + IN GUID *ObjectTypeGuid OPTIONAL, + IN GUID *InheritedObjectTypeGuid OPTIONAL, + PSID Sid, + BOOLEAN Success, + BOOLEAN Failure) +{ + ULONG Type; + + if (Success) + { + Flags |= SUCCESSFUL_ACCESS_ACE_FLAG; + } + + if (Failure) + { + Flags |= FAILED_ACCESS_ACE_FLAG; + } + + /* make sure we call RtlpAddKnownAce correctly */ + if (ObjectTypeGuid != NULL || InheritedObjectTypeGuid != NULL) + Type = SYSTEM_AUDIT_OBJECT_ACE_TYPE; + else + Type = SYSTEM_AUDIT_ACE_TYPE; + + return RtlpAddKnownAce (Acl, + Revision, + Flags, + AccessMask, + ObjectTypeGuid, + InheritedObjectTypeGuid, + Sid, + Type); }

18 years, 7 months

[greatlrd] 21874: [AUDIT] after looking through code no signs of reverse engineering were found. COde was take from wine and stub wirten by EA

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed May 10 12:51:13 2006 New Revision: 21874 URL: http://svn.reactos.ru/svn/reactos?rev=21874&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found. COde was take from wine and stub wirten by EA Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c (props changed) Propchange: trunk/reactos/dll/win32/advapi32/reg/reg.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 7 months

[greatlrd] 21873: [AUDIT] advapi32 is from wine, objust clean

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed May 10 12:41:27 2006 New Revision: 21873 URL: http://svn.reactos.ru/svn/reactos?rev=21873&view=rev Log: [AUDIT] advapi32 is from wine, objust clean Modified: trunk/reactos/dll/win32/advapi32/advapi32.def (props changed) trunk/reactos/dll/win32/advapi32/advapi32.h (props changed) trunk/reactos/dll/win32/advapi32/advapi32.rc (props changed) trunk/reactos/dll/win32/advapi32/crypt/crypt.c (props changed) trunk/reactos/dll/win32/advapi32/crypt/crypt.h (props changed) trunk/reactos/dll/win32/advapi32/crypt/crypt_des.c (props changed) trunk/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c (props changed) trunk/reactos/dll/win32/advapi32/crypt/crypt_md4.c (props changed) trunk/reactos/dll/win32/advapi32/crypt/crypt_md5.c (props changed) trunk/reactos/dll/win32/advapi32/crypt/crypt_sha.c (props changed) trunk/reactos/dll/win32/advapi32/misc/dllmain.c (props changed) trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c (props changed) trunk/reactos/dll/win32/advapi32/misc/logon.c (props changed) trunk/reactos/dll/win32/advapi32/misc/msi.c (props changed) trunk/reactos/dll/win32/advapi32/misc/shutdown.c (props changed) trunk/reactos/dll/win32/advapi32/misc/sysfunc.c (props changed) trunk/reactos/dll/win32/advapi32/sec/misc.c (props changed) trunk/reactos/dll/win32/advapi32/service/eventlog.c (props changed) trunk/reactos/dll/win32/advapi32/service/scm.c (props changed) trunk/reactos/dll/win32/advapi32/service/sctrl.c (props changed) trunk/reactos/dll/win32/advapi32/service/undoc.c (props changed) trunk/reactos/dll/win32/advapi32/token/privilege.c (props changed) trunk/reactos/dll/win32/advapi32/token/token.c (props changed) Propchange: trunk/reactos/dll/win32/advapi32/advapi32.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/advapi32.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/advapi32.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/crypt/crypt.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/crypt/crypt.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/crypt/crypt_des.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/crypt/crypt_md4.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/crypt/crypt_md5.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/crypt/crypt_sha.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/misc/dllmain.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/misc/logon.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/misc/msi.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/misc/shutdown.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/misc/sysfunc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/sec/misc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/service/eventlog.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/service/scm.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/service/sctrl.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/service/undoc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/token/privilege.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/advapi32/token/token.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 7 months

[greatlrd] 21872: [AUDIT] after looking through code no signs of reverse engineering were found.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed May 10 12:32:32 2006 New Revision: 21872 URL: http://svn.reactos.ru/svn/reactos?rev=21872&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found. Modified: trunk/reactos/dll/ntdll/def/ntdll.def (props changed) trunk/reactos/dll/ntdll/def/ntdll.rc (props changed) Propchange: trunk/reactos/dll/ntdll/def/ntdll.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/ntdll/def/ntdll.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 7 months

[hpoussin] 21871: Update version.dll to lastest Wine version. Fixes a bug in some installers. It was forked in revision 8782 to let Winzip to work. I've checked that Winzip is also working with this version

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed May 10 12:19:03 2006 New Revision: 21871 URL: http://svn.reactos.ru/svn/reactos?rev=21871&view=rev Log: Update version.dll to lastest Wine version. Fixes a bug in some installers. It was forked in revision 8782 to let Winzip to work. I've checked that Winzip is also working with this version Modified: trunk/reactos/dll/win32/version/info.c trunk/reactos/dll/win32/version/install.c trunk/reactos/dll/win32/version/resource.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/version/info.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/version/info.c?re… ============================================================================== --- trunk/reactos/dll/win32/version/info.c (original) +++ trunk/reactos/dll/win32/version/info.c Wed May 10 12:19:03 2006 @@ -4,6 +4,7 @@ * Copyright 1996,1997 Marcus Meissner * Copyright 1997 David Cuthbert * Copyright 1999 Ulrich Weigand + * Copyright 2005 Paul Vriens * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,11 +20,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * TODO - * o Verify VerQueryValue() - */ -#include "config.h" -//#include "wine/port.h" + */ #include <stdarg.h> #include <stdlib.h> @@ -31,188 +28,152 @@ #include "windef.h" #include "winbase.h" -#include "wingdi.h" +#include "winreg.h" +#include "winver.h" +#include "winternl.h" #include "winuser.h" -#include "winnls.h" -#include "winver.h" +#include "wine/unicode.h" +#include "winerror.h" #include "wine/debug.h" -#include "wine/unicode.h" - -/*#ifdef __REACTOS__ -DWORD WINAPI GetFileResourceSize16( LPCSTR lpszFileName, LPCSTR lpszResType, - LPCSTR lpszResId, LPDWORD lpdwFileOffset ); -DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType, - LPCSTR lpszResId, DWORD dwFileOffset, - DWORD dwResLen, LPVOID lpvData ) -#endif*/ WINE_DEFAULT_DEBUG_CHANNEL(ver); -static -void -VERSION_A2W ( LPWSTR wide_str, LPCSTR ansi_str, int len ) -{ - MultiByteToWideChar ( CP_ACP, 0, ansi_str, -1, wide_str, len ); -} - -static -void -VERSION_W2A ( LPSTR ansi_str, LPCWSTR wide_str, int len ) -{ - WideCharToMultiByte ( CP_ACP, 0, wide_str, -1, ansi_str, len, NULL, NULL ); -} - -static -LPWSTR -VERSION_AllocA2W ( LPCSTR ansi_str ) -{ - int len = MultiByteToWideChar ( CP_ACP, 0, ansi_str, -1, NULL, 0 ); - LPWSTR wide_str = HeapAlloc ( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - if ( !wide_str ) - return NULL; - VERSION_A2W ( wide_str, ansi_str, len ); - return wide_str; -} - -static -LPSTR -VERSION_AllocW2A ( LPCWSTR wide_str ) -{ - int len = WideCharToMultiByte ( CP_ACP, 0, wide_str, -1, NULL, 0, NULL, NULL ); - LPSTR ansi_str = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); - if (!ansi_str) - return NULL; - VERSION_W2A ( ansi_str, wide_str, len ); - return ansi_str; -} - -static -void -VERSION_Free ( LPVOID lpvoid ) -{ - HeapFree ( GetProcessHeap(), 0, lpvoid ); -} - - /****************************************************************************** * - * This function will print via dprintf[_]ver to stddeb debug info regarding + * This function will print via standard TRACE, debug info regarding * the file info structure vffi. * 15-Feb-1998 Dimitrie Paun (dimi(a)cs.toronto.edu) * Added this function to clean up the code. * *****************************************************************************/ -static -void -print_vffi_debug(VS_FIXEDFILEINFO *vffi) -{ - TRACE(" structversion=%u.%u, fileversion=%u.%u.%u.%u, productversion=%u.%u.%u.%u, flagmask=0x%lx, flags=%s%s%s%s%s%s\n", - HIWORD(vffi->dwStrucVersion),LOWORD(vffi->dwStrucVersion), - HIWORD(vffi->dwFileVersionMS),LOWORD(vffi->dwFileVersionMS), - HIWORD(vffi->dwFileVersionLS),LOWORD(vffi->dwFileVersionLS), - HIWORD(vffi->dwProductVersionMS),LOWORD(vffi->dwProductVersionMS), - HIWORD(vffi->dwProductVersionLS),LOWORD(vffi->dwProductVersionLS), - vffi->dwFileFlagsMask, - (vffi->dwFileFlags & VS_FF_DEBUG) ? "DEBUG," : "", - (vffi->dwFileFlags & VS_FF_PRERELEASE) ? "PRERELEASE," : "", - (vffi->dwFileFlags & VS_FF_PATCHED) ? "PATCHED," : "", - (vffi->dwFileFlags & VS_FF_PRIVATEBUILD) ? "PRIVATEBUILD," : "", - (vffi->dwFileFlags & VS_FF_INFOINFERRED) ? "INFOINFERRED," : "", - (vffi->dwFileFlags & VS_FF_SPECIALBUILD) ? "SPECIALBUILD," : "" - ); - - TRACE("("); - TRACE(" OS=0x%x.0x%x ", - HIWORD(vffi->dwFileOS), - LOWORD(vffi->dwFileOS) - ); - switch (vffi->dwFileOS&0xFFFF0000) { - case VOS_DOS:TRACE("DOS,");break; - case VOS_OS216:TRACE("OS/2-16,");break; - case VOS_OS232:TRACE("OS/2-32,");break; - case VOS_NT:TRACE("NT,");break; - case VOS_UNKNOWN: - default: - TRACE("UNKNOWN(0x%lx),",vffi->dwFileOS&0xFFFF0000);break; - } - switch (LOWORD(vffi->dwFileOS)) { - case VOS__BASE:TRACE("BASE");break; - case VOS__WINDOWS16:TRACE("WIN16");break; - case VOS__WINDOWS32:TRACE("WIN32");break; - case VOS__PM16:TRACE("PM16");break; - case VOS__PM32:TRACE("PM32");break; - default:TRACE("UNKNOWN(0x%x)",LOWORD(vffi->dwFileOS));break; - } - TRACE(")\n"); - - switch (vffi->dwFileType) { - default: - case VFT_UNKNOWN: - TRACE("filetype=Unknown(0x%lx)",vffi->dwFileType); - break; - case VFT_APP:TRACE("filetype=APP,");break; - case VFT_DLL:TRACE("filetype=DLL,");break; - case VFT_DRV: - TRACE("filetype=DRV,"); - switch(vffi->dwFileSubtype) { - default: - case VFT2_UNKNOWN: - TRACE("UNKNOWN(0x%lx)",vffi->dwFileSubtype); - break; - case VFT2_DRV_PRINTER: - TRACE("PRINTER"); - break; - case VFT2_DRV_KEYBOARD: - TRACE("KEYBOARD"); - break; - case VFT2_DRV_LANGUAGE: - TRACE("LANGUAGE"); - break; - case VFT2_DRV_DISPLAY: - TRACE("DISPLAY"); - break; - case VFT2_DRV_MOUSE: - TRACE("MOUSE"); - break; - case VFT2_DRV_NETWORK: - TRACE("NETWORK"); - break; - case VFT2_DRV_SYSTEM: - TRACE("SYSTEM"); - break; - case VFT2_DRV_INSTALLABLE: - TRACE("INSTALLABLE"); - break; - case VFT2_DRV_SOUND: - TRACE("SOUND"); - break; - case VFT2_DRV_COMM: - TRACE("COMM"); - break; - case VFT2_DRV_INPUTMETHOD: - TRACE("INPUTMETHOD"); - break; - } - break; - case VFT_FONT: - TRACE("filetype=FONT."); - switch (vffi->dwFileSubtype) { - default: - TRACE("UNKNOWN(0x%lx)",vffi->dwFileSubtype); - break; - case VFT2_FONT_RASTER:TRACE("RASTER");break; - case VFT2_FONT_VECTOR:TRACE("VECTOR");break; - case VFT2_FONT_TRUETYPE:TRACE("TRUETYPE");break; - } - break; - case VFT_VXD:TRACE("filetype=VXD");break; - case VFT_STATIC_LIB:TRACE("filetype=STATIC_LIB");break; - } - TRACE("\n"); - TRACE(" filedata=0x%lx.0x%lx\n", - vffi->dwFileDateMS,vffi->dwFileDateLS); -} - +static void print_vffi_debug(VS_FIXEDFILEINFO *vffi) +{ + BOOL versioned_printer = FALSE; + + if((vffi->dwFileType == VFT_DLL) || (vffi->dwFileType == VFT_DRV)) + { + if(vffi->dwFileSubtype == VFT2_DRV_VERSIONED_PRINTER) + /* this is documented for newer w2k Drivers and up */ + versioned_printer = TRUE; + else if( (vffi->dwFileSubtype == VFT2_DRV_PRINTER) && + (vffi->dwFileVersionMS != vffi->dwProductVersionMS) && + (vffi->dwFileVersionMS > 0) && + (vffi->dwFileVersionMS <= 3) ) + /* found this on NT 3.51, NT4.0 and old w2k Drivers */ + versioned_printer = TRUE; + } + + TRACE("structversion=%u.%u, ", + HIWORD(vffi->dwStrucVersion),LOWORD(vffi->dwStrucVersion)); + if(versioned_printer) + { + WORD mode = LOWORD(vffi->dwFileVersionMS); + WORD ver_rev = HIWORD(vffi->dwFileVersionLS); + TRACE("fileversion=%lu.%u.%u.%u (%s.major.minor.release), ", + (vffi->dwFileVersionMS), + HIBYTE(ver_rev), LOBYTE(ver_rev), LOWORD(vffi->dwFileVersionLS), + (mode == 3) ? "Usermode" : ((mode <= 2) ? "Kernelmode" : "?") ); + } + else + { + TRACE("fileversion=%u.%u.%u.%u, ", + HIWORD(vffi->dwFileVersionMS),LOWORD(vffi->dwFileVersionMS), + HIWORD(vffi->dwFileVersionLS),LOWORD(vffi->dwFileVersionLS)); + } + TRACE("productversion=%u.%u.%u.%u\n", + HIWORD(vffi->dwProductVersionMS),LOWORD(vffi->dwProductVersionMS), + HIWORD(vffi->dwProductVersionLS),LOWORD(vffi->dwProductVersionLS)); + + TRACE("flagmask=0x%lx, flags=0x%lx %s%s%s%s%s%s\n", + vffi->dwFileFlagsMask, vffi->dwFileFlags, + (vffi->dwFileFlags & VS_FF_DEBUG) ? "DEBUG," : "", + (vffi->dwFileFlags & VS_FF_PRERELEASE) ? "PRERELEASE," : "", + (vffi->dwFileFlags & VS_FF_PATCHED) ? "PATCHED," : "", + (vffi->dwFileFlags & VS_FF_PRIVATEBUILD) ? "PRIVATEBUILD," : "", + (vffi->dwFileFlags & VS_FF_INFOINFERRED) ? "INFOINFERRED," : "", + (vffi->dwFileFlags & VS_FF_SPECIALBUILD) ? "SPECIALBUILD," : ""); + + TRACE("("); + + TRACE("OS=0x%x.0x%x ", HIWORD(vffi->dwFileOS), LOWORD(vffi->dwFileOS)); + + switch (vffi->dwFileOS&0xFFFF0000) + { + case VOS_DOS:TRACE("DOS,");break; + case VOS_OS216:TRACE("OS/2-16,");break; + case VOS_OS232:TRACE("OS/2-32,");break; + case VOS_NT:TRACE("NT,");break; + case VOS_UNKNOWN: + default: + TRACE("UNKNOWN(0x%lx),",vffi->dwFileOS&0xFFFF0000);break; + } + + switch (LOWORD(vffi->dwFileOS)) + { + case VOS__BASE:TRACE("BASE");break; + case VOS__WINDOWS16:TRACE("WIN16");break; + case VOS__WINDOWS32:TRACE("WIN32");break; + case VOS__PM16:TRACE("PM16");break; + case VOS__PM32:TRACE("PM32");break; + default: + TRACE("UNKNOWN(0x%x)",LOWORD(vffi->dwFileOS));break; + } + + TRACE(")\n"); + + switch (vffi->dwFileType) + { + case VFT_APP:TRACE("filetype=APP");break; + case VFT_DLL: + TRACE("filetype=DLL"); + if(vffi->dwFileSubtype != 0) + { + if(versioned_printer) /* NT3.x/NT4.0 or old w2k Driver */ + TRACE(",PRINTER"); + TRACE(" (subtype=0x%lx)", vffi->dwFileSubtype); + } + break; + case VFT_DRV: + TRACE("filetype=DRV,"); + switch(vffi->dwFileSubtype) + { + case VFT2_DRV_PRINTER:TRACE("PRINTER");break; + case VFT2_DRV_KEYBOARD:TRACE("KEYBOARD");break; + case VFT2_DRV_LANGUAGE:TRACE("LANGUAGE");break; + case VFT2_DRV_DISPLAY:TRACE("DISPLAY");break; + case VFT2_DRV_MOUSE:TRACE("MOUSE");break; + case VFT2_DRV_NETWORK:TRACE("NETWORK");break; + case VFT2_DRV_SYSTEM:TRACE("SYSTEM");break; + case VFT2_DRV_INSTALLABLE:TRACE("INSTALLABLE");break; + case VFT2_DRV_SOUND:TRACE("SOUND");break; + case VFT2_DRV_COMM:TRACE("COMM");break; + case VFT2_DRV_INPUTMETHOD:TRACE("INPUTMETHOD");break; + case VFT2_DRV_VERSIONED_PRINTER:TRACE("VERSIONED_PRINTER");break; + case VFT2_UNKNOWN: + default: + TRACE("UNKNOWN(0x%lx)",vffi->dwFileSubtype);break; + } + break; + case VFT_FONT: + TRACE("filetype=FONT,"); + switch (vffi->dwFileSubtype) + { + case VFT2_FONT_RASTER:TRACE("RASTER");break; + case VFT2_FONT_VECTOR:TRACE("VECTOR");break; + case VFT2_FONT_TRUETYPE:TRACE("TRUETYPE");break; + default:TRACE("UNKNOWN(0x%lx)",vffi->dwFileSubtype);break; + } + break; + case VFT_VXD:TRACE("filetype=VXD");break; + case VFT_STATIC_LIB:TRACE("filetype=STATIC_LIB");break; + case VFT_UNKNOWN: + default: + TRACE("filetype=Unknown(0x%lx)",vffi->dwFileType);break; + } + + TRACE("\n"); + TRACE("filedate=0x%lx.0x%lx\n",vffi->dwFileDateMS,vffi->dwFileDateLS); +} /*********************************************************************** * Version Info Structure @@ -222,7 +183,20 @@ { WORD wLength; WORD wValueLength; - WORD bText; + CHAR szKey[1]; +#if 0 /* variable length structure */ + /* DWORD aligned */ + BYTE Value[]; + /* DWORD aligned */ + VS_VERSION_INFO_STRUCT16 Children[]; +#endif +} VS_VERSION_INFO_STRUCT16; + +typedef struct +{ + WORD wLength; + WORD wValueLength; + WORD wType; WCHAR szKey[1]; #if 0 /* variable length structure */ /* DWORD aligned */ @@ -231,32 +205,28 @@ VS_VERSION_INFO_STRUCT32 Children[]; #endif } VS_VERSION_INFO_STRUCT32; -/* + #define VersionInfoIs16( ver ) \ ( ((VS_VERSION_INFO_STRUCT16 *)ver)->szKey[0] >= ' ' ) -*/ + #define DWORD_ALIGN( base, ptr ) \ ( (LPBYTE)(base) + ((((LPBYTE)(ptr) - (LPBYTE)(base)) + 3) & ~3) ) -/* + #define VersionInfo16_Value( ver ) \ DWORD_ALIGN( (ver), (ver)->szKey + strlen((ver)->szKey) + 1 ) -*/ #define VersionInfo32_Value( ver ) \ DWORD_ALIGN( (ver), (ver)->szKey + strlenW((ver)->szKey) + 1 ) -/* + #define VersionInfo16_Children( ver ) \ (VS_VERSION_INFO_STRUCT16 *)( VersionInfo16_Value( ver ) + \ ( ( (ver)->wValueLength + 3 ) & ~3 ) ) -*/ #define VersionInfo32_Children( ver ) \ (VS_VERSION_INFO_STRUCT32 *)( VersionInfo32_Value( ver ) + \ ( ( (ver)->wValueLength * \ - ((ver)->bText? 2 : 1) + 3 ) & ~3 ) ) - -/* + ((ver)->wType? 2 : 1) + 3 ) & ~3 ) ) + #define VersionInfo16_Next( ver ) \ (VS_VERSION_INFO_STRUCT16 *)( (LPBYTE)ver + (((ver)->wLength + 3) & ~3) ) -*/ #define VersionInfo32_Next( ver ) \ (VS_VERSION_INFO_STRUCT32 *)( (LPBYTE)ver + (((ver)->wLength + 3) & ~3) ) @@ -264,280 +234,626 @@ * VERSION_GetFileVersionInfo_PE [internal] * * NOTE: returns size of the PE VERSION resource or 0xFFFFFFFF - * in the case if file exists, but VERSION_INFO not found. - * FIXME: handle is not used. - */ -static -DWORD -VERSION_GetFileVersionInfo_PE ( - LPCWSTR filename, LPDWORD handle, - DWORD datasize, LPVOID data ) -{ - VS_FIXEDFILEINFO *vffi; - DWORD len; - BYTE *buf; - HMODULE hModule; - HRSRC hRsrc; - HGLOBAL hMem; - - TRACE("(%s,%p)\n", debugstr_w(filename), handle ); - - hModule = GetModuleHandleW(filename); - if(!hModule) - hModule = LoadLibraryExW(filename, 0, LOAD_LIBRARY_AS_DATAFILE); + * in the case the file is a PE module, but VERSION_INFO not found. + */ +static DWORD VERSION_GetFileVersionInfo_PE( LPCWSTR filename, DWORD datasize, LPVOID data ) +{ + VS_FIXEDFILEINFO *vffi; + DWORD len; + BYTE *buf; + HMODULE hModule; + HRSRC hRsrc; + HGLOBAL hMem; + + TRACE("%s\n", debugstr_w(filename)); + + hModule = GetModuleHandleW(filename); + if(!hModule) + hModule = LoadLibraryExW(filename, 0, LOAD_LIBRARY_AS_DATAFILE); + else + hModule = LoadLibraryExW(filename, 0, 0); + if(!hModule) + { + WARN("Could not load %s\n", debugstr_w(filename)); + return 0; + } + hRsrc = FindResourceW(hModule, + MAKEINTRESOURCEW(VS_VERSION_INFO), + MAKEINTRESOURCEW(VS_FILE_INFO)); + if(!hRsrc) + { + WARN("Could not find VS_VERSION_INFO in %s\n", debugstr_w(filename)); + FreeLibrary(hModule); + return 0xFFFFFFFF; + } + len = SizeofResource(hModule, hRsrc); + hMem = LoadResource(hModule, hRsrc); + if(!hMem) + { + WARN("Could not load VS_VERSION_INFO from %s\n", debugstr_w(filename)); + FreeLibrary(hModule); + return 0xFFFFFFFF; + } + buf = LockResource(hMem); + + vffi = (VS_FIXEDFILEINFO *)VersionInfo32_Value( (VS_VERSION_INFO_STRUCT32 *)buf ); + + if ( vffi->dwSignature != VS_FFI_SIGNATURE ) + { + WARN("vffi->dwSignature is 0x%08lx, but not 0x%08lx!\n", + vffi->dwSignature, VS_FFI_SIGNATURE ); + len = 0xFFFFFFFF; + goto END; + } + + if ( TRACE_ON(ver) ) + print_vffi_debug( vffi ); + + if(data) + { + if(datasize < len) + len = datasize; /* truncate data */ + if(len) + memcpy(data, buf, len); else - hModule = LoadLibraryExW(filename, 0, 0); - if ( !hModule ) - { - WARN("Could not load %s\n", debugstr_w(filename)); - return 0; - } - hRsrc = FindResourceW(hModule, - MAKEINTRESOURCEW(VS_VERSION_INFO), - MAKEINTRESOURCEW(VS_FILE_INFO)); - if ( !hRsrc ) - { - WARN("Could not find VS_VERSION_INFO in %s\n", debugstr_w(filename)); - FreeLibrary(hModule); - return 0xFFFFFFFF; - } - len = SizeofResource(hModule, hRsrc); - hMem = LoadResource(hModule, hRsrc); - if(!hMem) - { - WARN("Could not load VS_VERSION_INFO from %s\n", debugstr_w(filename)); - FreeLibrary(hModule); - return 0xFFFFFFFF; - } - buf = LockResource(hMem); - - vffi = (VS_FIXEDFILEINFO *)VersionInfo32_Value( (VS_VERSION_INFO_STRUCT32 *)buf ); - - if ( vffi->dwSignature != VS_FFI_SIGNATURE ) - { - WARN("vffi->dwSignature is 0x%08lx, but not 0x%08lx!\n", - vffi->dwSignature, VS_FFI_SIGNATURE ); - len = 0xFFFFFFFF; - goto END; - } - - if ( TRACE_ON(ver) ) - print_vffi_debug( vffi ); - - if(data) - { - if(datasize < len) - len = datasize; /* truncate data */ - if(len) - memcpy(data, buf, len); - else - len = 0xFFFFFFFF; - } + len = 0xFFFFFFFF; + } END: - FreeResource(hMem); - FreeLibrary(hModule); - - return len; -} + FreeResource(hMem); + FreeLibrary(hModule); + + return len; +} + +#ifndef __REACTOS__ +/*********************************************************************** + * VERSION_GetFileVersionInfo_16 [internal] + * + * NOTE: returns size of the 16-bit VERSION resource or 0xFFFFFFFF + * in the case the file exists, but VERSION_INFO not found. + */ +static DWORD VERSION_GetFileVersionInfo_16( LPCSTR filename, DWORD datasize, LPVOID data ) +{ + VS_FIXEDFILEINFO *vffi; + DWORD len, offset; + BYTE *buf; + HMODULE16 hModule; + HRSRC16 hRsrc; + HGLOBAL16 hMem; + char dllname[20], owner[20], *p; + const char *basename; + BOOL is_builtin = FALSE; + + TRACE("%s\n", debugstr_a(filename)); + + /* strip path information */ + + basename = filename; + if (basename[0] && basename[1] == ':') basename += 2; /* strip drive specification */ + if ((p = strrchr( basename, '\\' ))) basename = p + 1; + if ((p = strrchr( basename, '/' ))) basename = p + 1; + + if (strlen(basename) < sizeof(dllname)-4) + { + int file_exists; + + strcpy( dllname, basename ); + p = strrchr( dllname, '.' ); + if (!p) strcat( dllname, ".dll" ); + for (p = dllname; *p; p++) if (*p >= 'A' && *p <= 'Z') *p += 32; + + if (wine_dll_get_owner( dllname, owner, sizeof(owner), &file_exists ) == 0) + is_builtin = TRUE; + } + + /* first try without loading a 16-bit module */ + if (is_builtin) + len = 0; + else + len = GetFileResourceSize16( filename, + MAKEINTRESOURCEA(VS_FILE_INFO), + MAKEINTRESOURCEA(VS_VERSION_INFO), + &offset ); + if (len) + { + if (!data) return len; + + len = GetFileResource16( filename, + MAKEINTRESOURCEA(VS_FILE_INFO), + MAKEINTRESOURCEA(VS_VERSION_INFO), + offset, datasize, data ); + if (len) + { + vffi = (VS_FIXEDFILEINFO *)VersionInfo16_Value( (VS_VERSION_INFO_STRUCT16 *)data ); + + if ( vffi->dwSignature == VS_FFI_SIGNATURE ) + { + if ( ((VS_VERSION_INFO_STRUCT16 *)data)->wLength < len ) + len = ((VS_VERSION_INFO_STRUCT16 *)data)->wLength; + + if ( TRACE_ON(ver) ) + print_vffi_debug( vffi ); + + return len; + } + } + } + + /* this might be a builtin 16-bit module */ + hModule = LoadLibrary16(filename); + if(hModule < 32) + { + WARN("Could not load %s\n", debugstr_a(filename)); + return 0; + } + hRsrc = FindResource16(hModule, + MAKEINTRESOURCEA(VS_VERSION_INFO), + MAKEINTRESOURCEA(VS_FILE_INFO)); + if(!hRsrc) + { + WARN("Could not find VS_VERSION_INFO in %s\n", debugstr_a(filename)); + FreeLibrary16(hModule); + return 0xFFFFFFFF; + } + len = SizeofResource16(hModule, hRsrc); + hMem = LoadResource16(hModule, hRsrc); + if(!hMem) + { + WARN("Could not load VS_VERSION_INFO from %s\n", debugstr_a(filename)); + FreeLibrary16(hModule); + return 0xFFFFFFFF; + } + buf = LockResource16(hMem); + + if(!VersionInfoIs16(buf)) + { + len = 0xFFFFFFFF; + goto END; + } + + vffi = (VS_FIXEDFILEINFO *)VersionInfo16_Value( (VS_VERSION_INFO_STRUCT16 *)buf ); + + if ( vffi->dwSignature != VS_FFI_SIGNATURE ) + { + WARN("vffi->dwSignature is 0x%08lx, but not 0x%08lx!\n", + vffi->dwSignature, VS_FFI_SIGNATURE ); + len = 0xFFFFFFFF; + goto END; + } + + if ( TRACE_ON(ver) ) + print_vffi_debug( vffi ); + + if(data) + { + if(datasize < len) + len = datasize; /* truncate data */ + if(len) + memcpy(data, buf, len); + else + len = 0xFFFFFFFF; + } +END: + FreeResource16(hMem); + FreeLibrary16(hModule); + + return len; +} +#endif /* ! __REACTOS__ */ /*********************************************************************** * GetFileVersionInfoSizeW [VERSION.@] */ -DWORD -WINAPI -GetFileVersionInfoSizeW ( LPCWSTR filename, LPDWORD handle ) -{ - DWORD len; - - TRACE("(%s,%p)\n", debugstr_w(filename), handle ); - if ( handle ) *handle = 0; //offset; - - len = VERSION_GetFileVersionInfo_PE ( filename, handle, 0, NULL ); - /* 0xFFFFFFFF means: file exists, but VERSION_INFO not found */ - if ( len == 0xFFFFFFFF ) - { - SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND); - return 0; - } - if ( len ) return (len<<1) + 4; // This matches MS's version.dll behavior, from what I can tell - - /* there used to be a bunch of 16-bit stuff here, but MS's docs say 16-bit not supported */ - - return 0; +DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) +{ + DWORD len; + + TRACE("(%s,%p)\n", debugstr_w(filename), handle ); + + if (handle) *handle = 0; + + if (!filename) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (!*filename) + { + SetLastError(ERROR_BAD_PATHNAME); + return 0; + } + + len = VERSION_GetFileVersionInfo_PE(filename, 0, NULL); + /* 0xFFFFFFFF means: file is a PE module, but VERSION_INFO not found */ + if(len == 0xFFFFFFFF) + { + SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND); + return 0; + } + + if (!len) + { +#ifdef __REACTOS__ + SetLastError(ERROR_FILE_NOT_FOUND); + return 0; +#else /* __REACTOS__ */ + LPSTR filenameA; + + len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL ); + filenameA = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte( CP_ACP, 0, filename, -1, filenameA, len, NULL, NULL ); + + len = VERSION_GetFileVersionInfo_16(filenameA, 0, NULL); + HeapFree( GetProcessHeap(), 0, filenameA ); + /* 0xFFFFFFFF means: file exists, but VERSION_INFO not found */ + if (!len) + { + SetLastError(ERROR_FILE_NOT_FOUND); + return 0; + } + if (len == 0xFFFFFFFF) + { + SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND); + return 0; + } + + /* We have a 16bit resource. + * + * XP/W2K/W2K3 uses a buffer which is more than the actual needed space: + * + * (info->wLength - sizeof(VS_FIXEDFILEINFO)) * 4 + * + * This extra buffer is used for ANSI to Unicode conversions in W-Calls. + * info->wLength should be the same as len. Currently it isn't but that + * doesn't seem to be a problem (len is bigger then info->wLength). + */ + len = (len - sizeof(VS_FIXEDFILEINFO)) * 4; +#endif /* ! __REACTOS__ */ + } + else + { + /* We have a 32bit resource. + * + * XP/W2K/W2K3 uses a buffer which is 2 times the actual needed space + 4 bytes "FE2X" + * This extra buffer is used for Unicode to ANSI conversions in A-Calls + */ + len = (len * 2) + 4; + } + + SetLastError(0); + return len; } /*********************************************************************** * GetFileVersionInfoSizeA [VERSION.@] */ -DWORD -WINAPI -GetFileVersionInfoSizeA ( LPCSTR filename, LPDWORD handle ) -{ - LPWSTR filenameW = VERSION_AllocA2W(filename); - DWORD ret = GetFileVersionInfoSizeW ( filenameW, handle ); - VERSION_Free ( filenameW ); - return ret; +DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle ) +{ + UNICODE_STRING filenameW; + DWORD retval; + + TRACE("(%s,%p)\n", debugstr_a(filename), handle ); + + if(filename) + RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); + else + filenameW.Buffer = NULL; + + retval = GetFileVersionInfoSizeW(filenameW.Buffer, handle); + + RtlFreeUnicodeString(&filenameW); + + return retval; } /*********************************************************************** * GetFileVersionInfoW [VERSION.@] */ -BOOL -WINAPI -GetFileVersionInfoW ( - LPCWSTR filename, DWORD handle, - DWORD datasize, LPVOID data ) -{ - DWORD len, extradata; - VS_VERSION_INFO_STRUCT32* vvis = (VS_VERSION_INFO_STRUCT32*)data; - - TRACE("(%s,%ld,size=%ld,data=%p)\n", - debugstr_w(filename), handle, datasize, data ); - - len = VERSION_GetFileVersionInfo_PE(filename, &handle, datasize, data); - - if ( len == 0xFFFFFFFF ) - return FALSE; - - extradata = datasize - vvis->wLength; - memmove ( ((char*)(data))+vvis->wLength, "FE2X", extradata > 4 ? 4 : extradata ); - - return TRUE; +BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, + DWORD datasize, LPVOID data ) +{ + DWORD len; + VS_VERSION_INFO_STRUCT32* vvis = (VS_VERSION_INFO_STRUCT32*)data; + + TRACE("(%s,%ld,size=%ld,data=%p)\n", + debugstr_w(filename), handle, datasize, data ); + + if (!data) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + len = VERSION_GetFileVersionInfo_PE(filename, datasize, data); + /* 0xFFFFFFFF means: file is a PE module, but VERSION_INFO not found */ + if (len == 0xFFFFFFFF) + { + SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND); + return FALSE; + } + + if (!len) + { +#ifdef __REACTOS__ + SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND); + return FALSE; +#else /* __REACTOS__ */ + LPSTR filenameA; + + len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL ); + filenameA = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte( CP_ACP, 0, filename, -1, filenameA, len, NULL, NULL ); + + len = VERSION_GetFileVersionInfo_16(filenameA, datasize, data); + HeapFree( GetProcessHeap(), 0, filenameA ); + /* 0xFFFFFFFF means: file exists, but VERSION_INFO not found */ + if (!len || len == 0xFFFFFFFF) + { + SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND); + return FALSE; + } + /* We have a 16bit resource. */ +#endif /* ! __REACTOS__ */ + } + else + { + static const char signature[] = "FE2X"; + DWORD bufsize = vvis->wLength + strlen(signature); + DWORD convbuf; + + /* We have a 32bit resource. + * + * XP/W2K/W2K3 uses a buffer which is 2 times the actual needed space + 4 bytes "FE2X" + * This extra buffer is used for Unicode to ANSI conversions in A-Calls + */ + + /* information is truncated to datasize bytes */ + if (datasize >= bufsize) + { + convbuf = datasize - vvis->wLength; + memcpy( ((char*)(data))+vvis->wLength, signature, convbuf > 4 ? 4 : convbuf ); + } + } + + SetLastError(0); + return TRUE; } /*********************************************************************** * GetFileVersionInfoA [VERSION.@] */ -BOOL -WINAPI -GetFileVersionInfoA ( - LPCSTR filename, DWORD handle, - DWORD datasize, LPVOID data ) -{ - LPWSTR filenameW = VERSION_AllocA2W ( filename ); - BOOL ret = GetFileVersionInfoW ( filenameW, handle, datasize, data ); - VERSION_Free ( filenameW ); - return ret; +BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, + DWORD datasize, LPVOID data ) +{ + UNICODE_STRING filenameW; + BOOL retval; + + TRACE("(%s,%ld,size=%ld,data=%p)\n", + debugstr_a(filename), handle, datasize, data ); + + if(filename) + RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); + else + filenameW.Buffer = NULL; + + retval = GetFileVersionInfoW(filenameW.Buffer, handle, datasize, data); + + RtlFreeUnicodeString(&filenameW); + + return retval; +} + +/*********************************************************************** + * VersionInfo16_FindChild [internal] + */ +static VS_VERSION_INFO_STRUCT16 *VersionInfo16_FindChild( VS_VERSION_INFO_STRUCT16 *info, + LPCSTR szKey, UINT cbKey ) +{ + VS_VERSION_INFO_STRUCT16 *child = VersionInfo16_Children( info ); + + while ((char *)child < (char *)info + info->wLength ) + { + if ( !strncasecmp( child->szKey, szKey, cbKey ) ) + return child; + + if (!(child->wLength)) return NULL; + child = VersionInfo16_Next( child ); + } + + return NULL; } /*********************************************************************** * VersionInfo32_FindChild [internal] */ -static -VS_VERSION_INFO_STRUCT32* -VersionInfo32_FindChild ( - VS_VERSION_INFO_STRUCT32 *info, - LPCWSTR szKey, UINT cbKey ) -{ - VS_VERSION_INFO_STRUCT32 *child = VersionInfo32_Children( info ); - - while ( (DWORD)child < (DWORD)info + info->wLength ) - { - if ( !strncmpiW( child->szKey, szKey, cbKey ) ) - return child; - - child = VersionInfo32_Next( child ); - } - - return NULL; -} - -static -VS_VERSION_INFO_STRUCT32* -VERSION_VerQueryValue ( VS_VERSION_INFO_STRUCT32* info, LPCWSTR lpSubBlock ) -{ - while ( *lpSubBlock ) - { - /* Find next path component */ - LPCWSTR lpNextSlash; - for ( lpNextSlash = lpSubBlock; *lpNextSlash; lpNextSlash++ ) - { - if ( *lpNextSlash == '\\' ) - break; - } - - /* Skip empty components */ - if ( lpNextSlash == lpSubBlock ) - { - lpSubBlock++; - continue; - } - - /* We have a non-empty component: search info for key */ - info = VersionInfo32_FindChild ( info, lpSubBlock, lpNextSlash-lpSubBlock ); - if ( !info ) return NULL; - - /* Skip path component */ - lpSubBlock = lpNextSlash; - } - return info; +static VS_VERSION_INFO_STRUCT32 *VersionInfo32_FindChild( VS_VERSION_INFO_STRUCT32 *info, + LPCWSTR szKey, UINT cbKey ) +{ + VS_VERSION_INFO_STRUCT32 *child = VersionInfo32_Children( info ); + + while ((char *)child < (char *)info + info->wLength ) + { + if ( !strncmpiW( child->szKey, szKey, cbKey ) ) + return child; + + child = VersionInfo32_Next( child ); + } + + return NULL; +} + +/*********************************************************************** + * VersionInfo16_QueryValue [internal] + * + * Gets a value from a 16-bit NE resource + */ +static BOOL WINAPI VersionInfo16_QueryValue( VS_VERSION_INFO_STRUCT16 *info, LPCSTR lpSubBlock, + LPVOID *lplpBuffer, UINT *puLen ) +{ + while ( *lpSubBlock ) + { + /* Find next path component */ + LPCSTR lpNextSlash; + for ( lpNextSlash = lpSubBlock; *lpNextSlash; lpNextSlash++ ) + if ( *lpNextSlash == '\\' ) + break; + + /* Skip empty components */ + if ( lpNextSlash == lpSubBlock ) + { + lpSubBlock++; + continue; + } + + /* We have a non-empty component: search info for key */ + info = VersionInfo16_FindChild( info, lpSubBlock, lpNextSlash-lpSubBlock ); + if ( !info ) return FALSE; + + /* Skip path component */ + lpSubBlock = lpNextSlash; + } + + /* Return value */ + *lplpBuffer = VersionInfo16_Value( info ); + if (puLen) + *puLen = info->wValueLength; + + return TRUE; +} + +/*********************************************************************** + * VersionInfo32_QueryValue [internal] + * + * Gets a value from a 32-bit PE resource + */ +static BOOL WINAPI VersionInfo32_QueryValue( VS_VERSION_INFO_STRUCT32 *info, LPCWSTR lpSubBlock, + LPVOID *lplpBuffer, UINT *puLen ) +{ + TRACE("lpSubBlock : (%s)\n", debugstr_w(lpSubBlock)); + + while ( *lpSubBlock ) + { + /* Find next path component */ + LPCWSTR lpNextSlash; + for ( lpNextSlash = lpSubBlock; *lpNextSlash; lpNextSlash++ ) + if ( *lpNextSlash == '\\' ) + break; + + /* Skip empty components */ + if ( lpNextSlash == lpSubBlock ) + { + lpSubBlock++; + continue; + } + + /* We have a non-empty component: search info for key */ + info = VersionInfo32_FindChild( info, lpSubBlock, lpNextSlash-lpSubBlock ); + if ( !info ) return FALSE; + + /* Skip path component */ + lpSubBlock = lpNextSlash; + } + + /* Return value */ + *lplpBuffer = VersionInfo32_Value( info ); + if (puLen) + *puLen = info->wValueLength; + + return TRUE; +} + +/*********************************************************************** + * VerQueryValueA [VERSION.@] + */ +BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPSTR lpSubBlock, + LPVOID *lplpBuffer, UINT *puLen ) +{ + static const char rootA[] = "\\"; + static const char varfileinfoA[] = "\\VarFileInfo\\Translation"; + VS_VERSION_INFO_STRUCT16 *info = (VS_VERSION_INFO_STRUCT16 *)pBlock; + + TRACE("(%p,%s,%p,%p)\n", + pBlock, debugstr_a(lpSubBlock), lplpBuffer, puLen ); + + if ( !VersionInfoIs16( info ) ) + { + BOOL ret; + INT len; + LPWSTR lpSubBlockW; + + len = MultiByteToWideChar(CP_ACP, 0, lpSubBlock, -1, NULL, 0); + lpSubBlockW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + + if (!lpSubBlockW) + return FALSE; + + MultiByteToWideChar(CP_ACP, 0, lpSubBlock, -1, lpSubBlockW, len); + + ret = VersionInfo32_QueryValue(pBlock, lpSubBlockW, lplpBuffer, puLen); + + HeapFree(GetProcessHeap(), 0, lpSubBlockW); + + if (ret && strcasecmp( lpSubBlock, rootA ) && strcasecmp( lpSubBlock, varfileinfoA )) + { + LPSTR lpBufferA = (LPSTR)pBlock + info->wLength + 4; + DWORD pos = (LPSTR)*lplpBuffer - (LPSTR)pBlock; + + len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)*lplpBuffer, -1, + lpBufferA + pos, info->wLength - pos, NULL, NULL); + *lplpBuffer = lpBufferA + pos; + *puLen = len; + } + return ret; + } + + return VersionInfo16_QueryValue(info, lpSubBlock, lplpBuffer, puLen); } /*********************************************************************** * VerQueryValueW [VERSION.@] */ -BOOL -WINAPI -VerQueryValueW ( - const LPVOID pBlock, - LPWSTR lpSubBlock, - LPVOID *lplpBuffer, - UINT *puLen ) -{ - VS_VERSION_INFO_STRUCT32 *info = (VS_VERSION_INFO_STRUCT32 *)pBlock; - - TRACE("(%p,%s,%p,%p)\n", - pBlock, debugstr_w(lpSubBlock), lplpBuffer, puLen ); - - info = VERSION_VerQueryValue ( info, lpSubBlock ); - if ( !info ) - { - // FIXME: what should SetLastError be set to??? - return FALSE; - } - - *lplpBuffer = VersionInfo32_Value ( info ); - *puLen = info->wValueLength; - - return TRUE; -} - -/*********************************************************************** - * VerQueryValueA [VERSION.@] - */ -BOOL -WINAPI -VerQueryValueA ( - LPVOID pBlock, - LPSTR lpSubBlockA, - LPVOID *lplpBuffer, - UINT *puLen ) -{ - VS_VERSION_INFO_STRUCT32 *info = (VS_VERSION_INFO_STRUCT32 *)pBlock; - LPWSTR lpSubBlockW = VERSION_AllocA2W ( lpSubBlockA ); - - TRACE("(%p,%s,%p,%p)\n", - pBlock, debugstr_a(lpSubBlockA), lplpBuffer, puLen ); - - info = VERSION_VerQueryValue ( info, lpSubBlockW ); - - VERSION_Free ( lpSubBlockW ); - - if ( !info ) - { - // FIXME: what should SetLastError be set to??? - return FALSE; - } - - *lplpBuffer = VersionInfo32_Value ( info ); - *puLen = info->wValueLength; - - if ( info->bText ) - { - LPSTR str = VERSION_AllocW2A ( *lplpBuffer ); - memmove ( *lplpBuffer, str, info->wValueLength + 1 ); - VERSION_Free ( str ); - } - - return TRUE; -} +BOOL WINAPI VerQueryValueW( LPVOID pBlock, LPWSTR lpSubBlock, + LPVOID *lplpBuffer, UINT *puLen ) +{ + static const WCHAR rootW[] = { '\\', 0 }; + static const WCHAR varfileinfoW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o', + '\\','T','r','a','n','s','l','a','t','i','o','n', 0 }; + + VS_VERSION_INFO_STRUCT32 *info = (VS_VERSION_INFO_STRUCT32 *)pBlock; + + TRACE("(%p,%s,%p,%p)\n", + pBlock, debugstr_w(lpSubBlock), lplpBuffer, puLen ); + + if ( VersionInfoIs16( info ) ) + { + BOOL ret; + int len; + LPSTR lpSubBlockA; + + len = WideCharToMultiByte(CP_ACP, 0, lpSubBlock, -1, NULL, 0, NULL, NULL); + lpSubBlockA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); + + if (!lpSubBlockA) + return FALSE; + + WideCharToMultiByte(CP_ACP, 0, lpSubBlock, -1, lpSubBlockA, len, NULL, NULL); + + ret = VersionInfo16_QueryValue(pBlock, lpSubBlockA, lplpBuffer, puLen); + + HeapFree(GetProcessHeap(), 0, lpSubBlockA); + + if (ret && strcmpiW( lpSubBlock, rootW ) && strcmpiW( lpSubBlock, varfileinfoW )) + { + LPWSTR lpBufferW = (LPWSTR)((LPSTR)pBlock + info->wLength); + DWORD pos = (LPSTR)*lplpBuffer - (LPSTR)pBlock; + DWORD max = (info->wLength - sizeof(VS_FIXEDFILEINFO)) * 4 - info->wLength; + + len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*lplpBuffer, -1, + lpBufferW + pos, max/sizeof(WCHAR) - pos ); + *lplpBuffer = lpBufferW + pos; + *puLen = len; + } + return ret; + } + + return VersionInfo32_QueryValue(info, lpSubBlock, lplpBuffer, puLen); +} Modified: trunk/reactos/dll/win32/version/install.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/version/install.c… ============================================================================== --- trunk/reactos/dll/win32/version/install.c (original) +++ trunk/reactos/dll/win32/version/install.c Wed May 10 12:19:03 2006 @@ -21,8 +21,6 @@ * TODO * o Check the installation functions. */ -#include "config.h" -#include "wine/port.h" #include <stdlib.h> #include <stdarg.h> @@ -40,13 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ver); -/* Couple of Hacks */ -extern inline DWORD WINAPI GetLastError(void) -{ - DWORD ret; - __asm__ __volatile__( ".byte 0x64\n\tmovl 0x60,%0" : "=r" (ret) ); - return ret; -} /****************************************************************************** * testFileExistenceA @@ -191,8 +182,11 @@ } } - if (lpszFilename && !testFileExistenceA(curDir, lpszFilename, TRUE)) - retval |= VFF_FILEINUSE; + /* Check to see if the file exists and is inuse by another application */ + if (lpszFilename && testFileExistenceA(curDir, lpszFilename, FALSE)) { + if (lpszFilename && !testFileExistenceA(curDir, lpszFilename, TRUE)) + retval |= VFF_FILEINUSE; + } curDirSizeReq = strlen(curDir) + 1; destDirSizeReq = strlen(destDir) + 1; @@ -425,7 +419,7 @@ } ret = LZCopy(hfsrc,hfdst); _lclose(hfdst); - if (((long) ret) < 0) { + if (((LONG)ret) < 0) { /* translate LZ errors into VIF_xxx */ switch (ret) { case LZERROR_BADINHANDLE: @@ -479,8 +473,8 @@ if (VerQueryValueA(buf1,"\\VarFileInfo\\Translation",(LPVOID*)&tbuf1,&len1) && VerQueryValueA(buf2,"\\VarFileInfo\\Translation",(LPVOID*)&tbuf2,&len2) ) { - /* irgendwas mit tbuf1 und tbuf2 machen - * generiert DIFFLANG|MISMATCH + /* Do something with tbuf1 and tbuf2 + * generates DIFFLANG|MISMATCH */ } HeapFree(GetProcessHeap(), 0, buf2); @@ -499,7 +493,7 @@ xret|=VIF_TEMPFILE; } } else { - if (-1!=GetFileAttributesA(destfn)) + if (INVALID_FILE_ATTRIBUTES!=GetFileAttributesA(destfn)) if (!DeleteFileA(destfn)) { xret|=_error2vif(GetLastError())|VIF_CANNOTDELETE; DeleteFileA(tmpfn); Modified: trunk/reactos/dll/win32/version/resource.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/version/resource.… ============================================================================== --- trunk/reactos/dll/win32/version/resource.c (original) +++ trunk/reactos/dll/win32/version/resource.c Wed May 10 12:19:03 2006 @@ -38,8 +38,9 @@ #include "lzexpand.h" #include "wine/unicode.h" +#include "wine/winbase16.h" +#include "wine/winuser16.h" #include "winver.h" -#include "winnls.h" #include "wine/debug.h" @@ -73,8 +74,9 @@ { pos = (min + max) / 2; if (entry[pos].Id == id) - return (IMAGE_RESOURCE_DIRECTORY *)((char *)root + entry[pos].OffsetToDirectory); + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].OffsetToDirectory); if (entry[pos].Id > id) max = pos - 1; + else min = pos + 1; } return NULL; } @@ -92,7 +94,7 @@ const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); - return (IMAGE_RESOURCE_DIRECTORY *)((char *)root + entry->OffsetToDirectory); + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry->OffsetToDirectory); } @@ -130,11 +132,11 @@ while (min <= max) { pos = (min + max) / 2; - str = (IMAGE_RESOURCE_DIR_STRING_U *)((char *)root + entry[pos].NameOffset); + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const char *)root + entry[pos].NameOffset); res = strncmpiW( nameW, str->NameString, str->Length ); if (!res && namelen == str->Length) { - ret = (IMAGE_RESOURCE_DIRECTORY *)((char *)root + entry[pos].OffsetToDirectory); + ret = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].OffsetToDirectory); break; } if (res < 0) max = pos - 1; @@ -175,6 +177,7 @@ WARN("Can't handle %s files.\n", magic ); return 0; } + #ifndef __REACTOS__ /*********************************************************************** * load_ne_resource [internal] @@ -206,7 +209,7 @@ if ( !resTab ) return FALSE; LZSeek( lzfd, nehd.ne_rsrctab + nehdoffset, SEEK_SET ); - if ( resTabSize != LZRead( lzfd, resTab, resTabSize ) ) + if ( resTabSize != LZRead( lzfd, (char*)resTab, resTabSize ) ) { HeapFree( GetProcessHeap(), 0, resTab ); return FALSE; @@ -223,7 +226,7 @@ if (!(typeInfo->type_id & 0x8000)) { BYTE *p = resTab + typeInfo->type_id; - if ((*p == len) && !strncasecmp( p+1, typeid, len )) goto found_type; + if ((*p == len) && !strncasecmp( (char*)p+1, typeid, len )) goto found_type; } typeInfo = (NE_TYPEINFO *)((char *)(typeInfo + 1) + typeInfo->count * sizeof(NE_NAMEINFO)); @@ -253,7 +256,7 @@ { BYTE *p = resTab + nameInfo->id; if (nameInfo->id & 0x8000) continue; - if ((*p == len) && !strncasecmp( p+1, resid, len )) goto found_name; + if ((*p == len) && !strncasecmp( (char*)p+1, resid, len )) goto found_name; } } else /* numeric resource id */ @@ -274,7 +277,8 @@ HeapFree( GetProcessHeap(), 0, resTab ); return TRUE; } -#endif /* __REACTOS__ */ +#endif /* ! __REACTOS__ */ + /*********************************************************************** * load_pe_resource [internal] */ @@ -346,12 +350,12 @@ } LZSeek( lzfd, sections[i].PointerToRawData, SEEK_SET ); - if ( resSectionSize != LZRead( lzfd, resSection, resSectionSize ) ) goto done; + if ( resSectionSize != LZRead( lzfd, (char*)resSection, resSectionSize ) ) goto done; /* Find resource */ resDir = resSection + (resDataDir->VirtualAddress - sections[i].VirtualAddress); - resPtr = (PIMAGE_RESOURCE_DIRECTORY)resDir; + resPtr = (const IMAGE_RESOURCE_DIRECTORY*)resDir; resPtr = find_entry_by_name( resPtr, typeid, resDir ); if ( !resPtr ) { @@ -372,7 +376,7 @@ } /* Find resource data section */ - resData = (PIMAGE_RESOURCE_DATA_ENTRY)resPtr; + resData = (const IMAGE_RESOURCE_DATA_ENTRY*)resPtr; for ( i = 0; i < nSections; i++ ) if ( resData->OffsetToData >= sections[i].VirtualAddress && resData->OffsetToData < sections[i].VirtualAddress + @@ -419,12 +423,12 @@ switch ( read_xx_header( lzfd ) ) { case IMAGE_OS2_SIGNATURE: - #ifdef __REACTOS__ - ERR("OS2 Images not supported under ReactOS at this time."); - #else - retv = find_ne_resource( lzfd, lpszResType, lpszResId, +#ifdef __REACTOS__ + ERR("OS2 Images not supported under ReactOS at this time."); +#else + retv = find_ne_resource( lzfd, lpszResType, lpszResId, &reslen, lpdwFileOffset ); - #endif +#endif break; case IMAGE_NT_SIGNATURE: @@ -450,8 +454,8 @@ OFSTRUCT ofs; DWORD reslen = dwResLen; - TRACE("(%s,type=0x%lx,id=0x%lx,off=%ld,len=%ld,data=%p)\n", - debugstr_a(lpszFileName), (LONG)lpszResType, (LONG)lpszResId, + TRACE("(%s,type=%p,id=%p,off=%ld,len=%ld,data=%p)\n", + debugstr_a(lpszFileName), lpszResType, lpszResId, dwFileOffset, dwResLen, lpvData ); lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ ); @@ -462,13 +466,13 @@ switch ( read_xx_header( lzfd ) ) { case IMAGE_OS2_SIGNATURE: - #ifdef __REACTOS__ - ERR("OS2 Images not supported under ReactOS at this time."); - #else +#ifdef __REACTOS__ + ERR("OS2 Images not supported under ReactOS at this time."); +#else retv = find_ne_resource( lzfd, lpszResType, lpszResId, &reslen, &dwFileOffset ); - #endif - break; +#endif + break; case IMAGE_NT_SIGNATURE: retv = find_pe_resource( lzfd, lpszResType, lpszResId, @@ -489,4 +493,3 @@ return reslen; } - Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=2… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Wed May 10 12:19:03 2006 @@ -73,7 +73,7 @@ reactos/dll/win32/twain # Out of sync reactos/dll/win32/urlmon # Synced to Wine-0_9_10 reactos/dll/win32/uxtheme # Synced to Wine-0_9_10 -reactos/dll/win32/version # Out of sync +reactos/dll/win32/version # Synced at 20060509 reactos/dll/win32/wininet # Synced to Wine-0_9_10 reactos/dll/win32/wintrust # Synced to Wine-0_9_10 reactos/dll/win32/winmm # Forked at Wine-20050628

18 years, 7 months

[hpoussin] 21870: Add missing #define for VFT2_DRV_VERSIONED_PRINTER

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed May 10 11:10:11 2006 New Revision: 21870 URL: http://svn.reactos.ru/svn/reactos?rev=21870&view=rev Log: Add missing #define for VFT2_DRV_VERSIONED_PRINTER Modified: trunk/reactos/include/winver.h Modified: trunk/reactos/include/winver.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/winver.h?rev=21870&… ============================================================================== --- trunk/reactos/include/winver.h (original) +++ trunk/reactos/include/winver.h Wed May 10 11:10:11 2006 @@ -53,6 +53,7 @@ #define VFT2_DRV_SOUND 9 #define VFT2_DRV_COMM 10 #define VFT2_DRV_INPUTMETHOD 11 +#define VFT2_DRV_VERSIONED_PRINTER 12 #define VFT2_FONT_RASTER 1 #define VFT2_FONT_VECTOR 2 #define VFT2_FONT_TRUETYPE 3

18 years, 7 months

[hpoussin] 21869: Fix compilation with GCC4

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed May 10 00:50:46 2006 New Revision: 21869 URL: http://svn.reactos.ru/svn/reactos?rev=21869&view=rev Log: Fix compilation with GCC4 Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_properti… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Wed May 10 00:50:46 2006 @@ -217,17 +217,17 @@ AddressString = "0.0.0.0"; else if (!GetAddressFromField(Dlg, IDC_IPADDR, &Address, &AddressString)) goto cleanup; - rc = RegSetValueExA(hKey, "IPAddress", 0, REG_SZ, AddressString, strlen(AddressString) + 1); + rc = RegSetValueExA(hKey, "IPAddress", 0, REG_SZ, (const BYTE*)AddressString, strlen(AddressString) + 1); if (rc != ERROR_SUCCESS) goto cleanup; if (!SetIpAddressByDhcp && !GetAddressFromField(Dlg, IDC_SUBNETMASK, &Address, &AddressString)) goto cleanup; - rc = RegSetValueExA(hKey, "SubnetMask", 0, REG_SZ, AddressString, strlen(AddressString) + 1); + rc = RegSetValueExA(hKey, "SubnetMask", 0, REG_SZ, (const BYTE*)AddressString, strlen(AddressString) + 1); if (rc != ERROR_SUCCESS) goto cleanup; if (!SetIpAddressByDhcp && !GetAddressFromField(Dlg, IDC_DEFGATEWAY, &Address, &AddressString)) goto cleanup; - rc = RegSetValueExA(hKey, "DefaultGateway", 0, REG_SZ, AddressString, strlen(AddressString) + 1); + rc = RegSetValueExA(hKey, "DefaultGateway", 0, REG_SZ, (const BYTE*)AddressString, strlen(AddressString) + 1); if (rc != ERROR_SUCCESS) goto cleanup; RegCloseKey(hKey); @@ -246,7 +246,7 @@ { if (!GetAddressFromField(Dlg, IDC_DNS1, &Address, &AddressString)) goto cleanup; - rc = RegSetValueExA(hKey, "NameServer", 0, REG_SZ, AddressString, strlen(AddressString) + 1); + rc = RegSetValueExA(hKey, "NameServer", 0, REG_SZ, (const BYTE*)AddressString, strlen(AddressString) + 1); if (rc != ERROR_SUCCESS) goto cleanup; }

18 years, 7 months

[hpoussin] 21868: First fully functional version of ncpa. Requires a reboot after parameters changes.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed May 10 00:25:29 2006 New Revision: 21868 URL: http://svn.reactos.ru/svn/reactos?rev=21868&view=rev Log: First fully functional version of ncpa. Requires a reboot after parameters changes. Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_properti… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Wed May 10 00:25:29 2006 @@ -67,7 +67,7 @@ CheckDlgButton(Dlg, IDC_AUTODNS, Enabled ? BST_UNCHECKED : BST_CHECKED); EnableWindow(GetDlgItem(Dlg, IDC_DNS1), Enabled); - EnableWindow(GetDlgItem(Dlg, IDC_DNS2), Enabled); + EnableWindow(GetDlgItem(Dlg, IDC_DNS2), FALSE/*Enabled*/); if (! Enabled) { SendDlgItemMessage(Dlg, IDC_DNS1, IPM_CLEARADDRESS, 0, 0); SendDlgItemMessage(Dlg, IDC_DNS2, IPM_CLEARADDRESS, 0, 0); @@ -107,6 +107,27 @@ MessageBoxW(Parent, Msg, Error, MB_OK | MB_ICONSTOP); } +static +BOOL GetAddressFromField( HWND hwndDlg, UINT CtlId, + DWORD *dwIPAddr, + const char **AddressString ) { + LRESULT lResult; + struct in_addr inIPAddr; + + *AddressString = NULL; + + lResult = SendMessage(GetDlgItem(hwndDlg, CtlId), IPM_GETADDRESS, 0, + (ULONG_PTR)dwIPAddr); + if( lResult != 4 ) return FALSE; + + *dwIPAddr = htonl(*dwIPAddr); + inIPAddr.s_addr = *dwIPAddr; + *AddressString = inet_ntoa(inIPAddr); + if( !*AddressString ) return FALSE; + + return TRUE; +} + static BOOL ValidateAndStore(HWND Dlg, PTCPIP_PROPERTIES_DATA DlgData) { @@ -165,17 +186,79 @@ static BOOL InternTCPIPSettings(HWND Dlg, PTCPIP_PROPERTIES_DATA DlgData) { - BOOL Changed; + /*BOOL Changed; BOOL IpChanged; int DhcpAction; - LPWSTR AdapterName; - + LPWSTR AdapterName;*/ + BOOL SetIpAddressByDhcp; + BOOL SetDnsByDhcp; + TCHAR pszRegKey[MAX_PATH]; + const char *AddressString; + DWORD Address = 0; + LONG rc; + HKEY hKey = NULL; + BOOL ret = FALSE; + if (! ValidateAndStore(Dlg, DlgData)) { /* Should never happen, we should have validated at PSN_KILLACTIVE */ ASSERT(FALSE); return FALSE; } + SetIpAddressByDhcp = IsDlgButtonChecked(Dlg, IDC_USEDHCP); + SetDnsByDhcp = IsDlgButtonChecked(Dlg, IDC_AUTODNS); + + /* Save parameters in HKLM\SYSTEM\CurrentControlSet\Services\{GUID}\Parameters\Tcpip */ + _stprintf(pszRegKey,_T("SYSTEM\\CurrentControlSet\\Services\\%S\\Parameters\\Tcpip"), DlgData->AdapterName); + rc = RegOpenKey(HKEY_LOCAL_MACHINE, pszRegKey, &hKey); + if (rc != ERROR_SUCCESS) + goto cleanup; + if (SetIpAddressByDhcp) + AddressString = "0.0.0.0"; + else if (!GetAddressFromField(Dlg, IDC_IPADDR, &Address, &AddressString)) + goto cleanup; + rc = RegSetValueExA(hKey, "IPAddress", 0, REG_SZ, AddressString, strlen(AddressString) + 1); + if (rc != ERROR_SUCCESS) + goto cleanup; + if (!SetIpAddressByDhcp && !GetAddressFromField(Dlg, IDC_SUBNETMASK, &Address, &AddressString)) + goto cleanup; + rc = RegSetValueExA(hKey, "SubnetMask", 0, REG_SZ, AddressString, strlen(AddressString) + 1); + if (rc != ERROR_SUCCESS) + goto cleanup; + if (!SetIpAddressByDhcp && !GetAddressFromField(Dlg, IDC_DEFGATEWAY, &Address, &AddressString)) + goto cleanup; + rc = RegSetValueExA(hKey, "DefaultGateway", 0, REG_SZ, AddressString, strlen(AddressString) + 1); + if (rc != ERROR_SUCCESS) + goto cleanup; + RegCloseKey(hKey); + + /* Save parameters in HKLM\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters */ + rc = RegOpenKey(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters"), &hKey); + if (rc != ERROR_SUCCESS) + goto cleanup; + if (DlgData->Dns1 == INADDR_NONE) + { + rc = RegDeleteValue(hKey, _T("NameServer")); + if (rc != ERROR_SUCCESS && rc != ERROR_FILE_NOT_FOUND) + goto cleanup; + } + else + { + if (!GetAddressFromField(Dlg, IDC_DNS1, &Address, &AddressString)) + goto cleanup; + rc = RegSetValueExA(hKey, "NameServer", 0, REG_SZ, AddressString, strlen(AddressString) + 1); + if (rc != ERROR_SUCCESS) + goto cleanup; + } + + MessageBox(NULL, TEXT("You need to reboot before the new parameters take effect."), TEXT("Reboot required"), MB_OK | MB_ICONWARNING); + ret = TRUE; + +cleanup: + if (hKey != NULL) + RegCloseKey(hKey); + return ret; +#if 0 Changed = FALSE; if (DlgData->DhcpEnabled) { Changed = ! DlgData->OldDhcpEnabled; @@ -213,6 +296,7 @@ /* FIXME Save default gateway and DNS entries */ return TRUE; +#endif } static INT_PTR CALLBACK

18 years, 7 months

[amunger] 21867: win32k: minor window class fixes - minor callproc handling bug - correctly updating the menu name pointers when moving classes to the shared heap Patch by w3seek.

by amunger＠svn.reactos.org

Author: amunger Date: Wed May 10 00:21:52 2006 New Revision: 21867 URL: http://svn.reactos.ru/svn/reactos?rev=21867&view=rev Log: win32k: minor window class fixes - minor callproc handling bug - correctly updating the menu name pointers when moving classes to the shared heap Patch by w3seek. Modified: trunk/reactos/subsystems/win32/win32k/include/class.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/class.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/class.h Wed May 10 00:21:52 2006 @@ -3,6 +3,13 @@ #define IS_ATOM(x) \ (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000)) + +static BOOL __inline +IsCallProcHandle(IN WNDPROC lpWndProc) +{ + /* FIXME - check for 64 bit architectures... */ + return ((ULONG_PTR)lpWndProc & 0xFFFF0000) == 0xFFFF0000; +} WNDPROC GetCallProcHandle(IN PCALLPROC CallProc); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c Wed May 10 00:21:52 2006 @@ -55,11 +55,6 @@ ASSERT(Class->Windows == 0); ASSERT(Class->Clone == NULL); - if (Class->Desktop != NULL) - { - ASSERT(Class->Clone == NULL); - } - if (Class->Base == Class) { /* destruct resources shared with clones */ @@ -316,6 +311,19 @@ /* update the base class first */ Class = Class->Base; + /* resolve any callproc handle if possible */ + if (IsCallProcHandle(WndProc)) + { + WNDPROC_INFO wpInfo; + + if (UserGetCallProcInfo((HANDLE)WndProc, + &wpInfo)) + { + WndProc = wpInfo.WindowProc; + /* FIXME - what if wpInfo.IsUnicode doesn't match Ansi? */ + } + } + Ret = IntGetClassWndProc(Class, GetW32ProcessInfo(), Ansi, @@ -648,6 +656,15 @@ NewClass->Desktop = NULL; NewClass->Base = NewClass; + + if (Class->MenuName == (PWSTR)(Class + 1)) + { + ULONG_PTR AnsiDelta = (ULONG_PTR)Class->AnsiMenuName - (ULONG_PTR)Class->MenuName; + + /* fixup the self-relative MenuName pointers */ + NewClass->MenuName = (PWSTR)(NewClass + 1); + NewClass->AnsiMenuName = (PSTR)((ULONG_PTR)NewClass->MenuName + AnsiDelta); + } if (!NewClass->System && NewClass->CallProc != NULL && !NewClass->GlobalCallProc) @@ -1088,206 +1105,6 @@ return Atom; } -static PWINDOWCLASS -IntClassResizeInternal(IN OUT PWINDOWCLASS Class, - IN INT ClsExtraNew, - IN PWINDOWCLASS *PrevLink) -{ - PWINDOWCLASS NewClass; - SIZE_T NewSize; - - /* NOTE: Do *not* access Class->Base here, it may be invalid at this point! */ - - /* temporarily unlink the class, as resizing it may change it's location */ - (void)InterlockedExchangePointer(PrevLink, - Class->Next); - - NewSize = (SIZE_T)ClsExtraNew + Class->ClassExtraDataOffset; - if (Class->Desktop != NULL) - { - NewClass = DesktopHeapReAlloc(Class->Desktop, - Class, - NewSize); - } - else - { - NewClass = UserHeapReAlloc(Class, - NewSize); - } - - if (NewClass == NULL) - { - /* link in the class again */ - (void)InterlockedExchangePointer(PrevLink, - Class); - - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - if (Class != NewClass) - { - /* adjust the menu name pointers, if neccessary */ - if (NewClass->MenuName != NULL && !IS_INTRESOURCE(NewClass->MenuName) && - NewClass->MenuName == (PWSTR)(NewClass + 1)) - { - ULONG_PTR PtrDelta = (ULONG_PTR)NewClass - (ULONG_PTR)Class; - - NewClass->MenuName = (PWSTR)((ULONG_PTR)NewClass->MenuName + PtrDelta); - NewClass->AnsiMenuName = (PSTR)((ULONG_PTR)NewClass->MenuName + PtrDelta); - } - - Class = NewClass; - } - - if (Class->ClsExtra < ClsExtraNew) - { - /* zero the memory allocated */ - RtlZeroMemory((PVOID)((ULONG_PTR)Class + Class->ClassExtraDataOffset + Class->ClsExtra), - ClsExtraNew - Class->ClsExtra); - } - - /* link in the class again */ - (void)InterlockedExchangePointer(PrevLink, - Class); - - return Class; -} - -static BOOL -IntClassResize(IN OUT PWINDOWCLASS Class, - IN PW32PROCESSINFO pi, - IN INT ClsExtraNew) -{ - PWINDOWCLASS *Link, NewClass, Clone, FailedResize = NULL; - BOOL FailOnResize; - - if (pi == NULL) - return FALSE; - - /* first modify the base class, then the clones */ - Class = Class->Base; - - if (ClsExtraNew < 0 || - (ULONG_PTR)ClsExtraNew + Class->ClassExtraDataOffset < Class->ClassExtraDataOffset) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if (Class->System) - Link = &pi->SystemClassList; - else if (Class->Global) - Link = &pi->GlobalClassList; - else - Link = &pi->LocalClassList; - - FailOnResize = Class->ClsExtra < ClsExtraNew; - - /* resize the base class */ - NewClass = IntClassResizeInternal(Class, - ClsExtraNew, - Link); - if (NewClass == NULL) - { - if (FailOnResize) - { - DPRINT1("Failed to resize the base class\n"); - return FALSE; - } - } - else - Class = NewClass; - - /* resize the clones */ - Link = &Class->Clone; - Clone = Class->Clone; - while (Clone != NULL) - { - NewClass = IntClassResizeInternal(Clone, - ClsExtraNew, - Link); - - if (NewClass == NULL) - { - if (FailOnResize) - { - /* roll back all changes */ - FailedResize = Clone; - break; - } - } - else - Clone = NewClass; - - /* save the pointer to the base class in case it changed */ - Clone->Base = Class; - - Link = &Clone->Next; - Clone = Clone->Next; - } - - if (FailedResize != NULL) - { - /* failed to resize one clone, roll back the changes to all - other clones and to the base class */ - DPRINT1("Failed to resize the cloned class 0x%p\n", FailedResize); - - if (Class->System) - Link = &pi->SystemClassList; - else if (Class->Global) - Link = &pi->GlobalClassList; - else - Link = &pi->LocalClassList; - - /* roll back the changes made to the base class */ - NewClass = IntClassResizeInternal(Class, - Class->ClsExtra, - Link); - if (NewClass != NULL) - Class = NewClass; - - /* roll back all changes made to the class clones */ - Link = &Class->Clone; - Clone = Class->Clone; - while (Clone != FailedResize) - { - ASSERT(Clone != NULL); - - NewClass = IntClassResizeInternal(Clone, - Class->ClsExtra, - Link); - if (NewClass != NULL) - Clone = NewClass; - - /* save the pointer to the base class in case it changed */ - Clone->Base = Class; - - Link = &Clone->Next; - Clone = Clone->Next; - } - - return FALSE; - } - else - { - /* all classes were successfully resized, - save the new extra data size */ - Class->ClsExtra = ClsExtraNew; - Clone = Class->Clone; - while (Clone != NULL) - { - Clone->ClsExtra = ClsExtraNew; - - ASSERT(Clone->Base == Class); - - Clone = Clone->Next; - } - - return TRUE; - } -} - RTL_ATOM UserRegisterClass(IN CONST WNDCLASSEXW* lpwcx, IN PUNICODE_STRING ClassName, @@ -1807,16 +1624,7 @@ break; case GCL_CBCLSEXTRA: - Ret = (ULONG_PTR)Class->ClsExtra; - if (Class->ClsExtra != (INT)NewLong) - { - if (!IntClassResize(Class, - GetW32ProcessInfo(), - (INT)NewLong)) - { - Ret = 0; - } - } + SetLastWin32Error(ERROR_INVALID_PARAMETER); break; case GCLP_HBRBACKGROUND: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Wed May 10 00:21:52 2006 @@ -3430,6 +3430,19 @@ BOOL Ansi) { WNDPROC Ret; + + /* resolve any callproc handle if possible */ + if (IsCallProcHandle(NewWndProc)) + { + WNDPROC_INFO wpInfo; + + if (UserGetCallProcInfo((HANDLE)NewWndProc, + &wpInfo)) + { + NewWndProc = wpInfo.WindowProc; + /* FIXME - what if wpInfo.IsUnicode doesn't match Ansi? */ + } + } /* attempt to get the previous window proc */ if (Window->IsSystem)

18 years, 7 months

← Newer
1
...
24
25
26
27
28
29
30
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2006