Ros-diffs June 2012

ros-diffs@reactos.org

11 participants
120 discussions

[jimtabor] 56705: [Win32k] - Turn off a debug print. Fixed wine Edit test_edit_control_2 SetFocus return and one more in Msg test_SetFocus.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jun 7 11:52:13 2012 New Revision: 56705 URL: http://svn.reactos.org/svn/reactos?rev=56705&view=rev Log: [Win32k] - Turn off a debug print. Fixed wine Edit test_edit_control_2 SetFocus return and one more in Msg test_SetFocus. Modified: trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Thu Jun 7 11:52:13 2012 @@ -596,12 +596,9 @@ } // Check again! SetActiveWindow could have set the focus via WM_ACTIVATE. - if (ThreadQueue->spwndFocus && ThreadQueue->spwndFocus == Window) - { - hWndPrev = UserHMGetHandle(ThreadQueue->spwndFocus); - } - - /* check if the specified window can be set in the input data of a given queue */ + hWndPrev = ThreadQueue->spwndFocus ? UserHMGetHandle(ThreadQueue->spwndFocus) : 0; + + /* check if the specified window can be set in the input data of a given queue */ if (ThreadQueue == Window->head.pti->MessageQueue) /* set the current thread focus window */ ThreadQueue->spwndFocus = Window; Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Thu Jun 7 11:52:13 2012 @@ -2413,7 +2413,7 @@ if (!co_WinPosShowWindow(Window, SW_HIDE)) { // Rule #1. if (ti->MessageQueue->spwndActive == Window && ti->MessageQueue == IntGetFocusMessageQueue()) - { ERR("DestroyWindow AOW\n"); + { //ERR("DestroyWindow AOW\n"); co_WinPosActivateOtherWindow(Window); } }

12 years, 6 months

[ekohl] 56704: [SAMLIB][SAMSRV] - Implement SamGetMembersInAlias and SamrGetMembersInAlias. - Add registry helper routines SampRegQueryKeyInfo, SampRegEnumerateValue and SampRegSetValue. - Remove u...

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Jun 7 10:31:17 2012 New Revision: 56704 URL: http://svn.reactos.org/svn/reactos?rev=56704&view=rev Log: [SAMLIB][SAMSRV] - Implement SamGetMembersInAlias and SamrGetMembersInAlias. - Add registry helper routines SampRegQueryKeyInfo, SampRegEnumerateValue and SampRegSetValue. - Remove unused SAM database code. - Store the name and members key (only for aliases and groups) in the database object. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/database.c trunk/reactos/dll/win32/samsrv/registry.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/include/ddk/ntsam.h Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Thu Jun 7 10:31:17 2012 @@ -303,6 +303,48 @@ NTSTATUS NTAPI +SamGetMembersInAlias(IN SAM_HANDLE AliasHandle, + OUT PSID **MemberIds, + OUT PULONG MemberCount) +{ + SAMPR_PSID_ARRAY_OUT SidArray; + NTSTATUS Status; + + TRACE("SamGetMembersInAlias(%p %p %p)\n", + AliasHandle, MemberIds, MemberCount); + + if ((MemberIds == NULL) || + (MemberCount == NULL)) + return STATUS_INVALID_PARAMETER; + + *MemberIds = NULL; + *MemberCount = 0; + + SidArray.Sids = NULL; + + RpcTryExcept + { + Status = SamrGetMembersInAlias((SAMPR_HANDLE)AliasHandle, + &SidArray); + if (NT_SUCCESS(Status)) + { + *MemberCount = SidArray.Count; + *MemberIds = (PSID *)(SidArray.Sids); + } + + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamLookupDomainInSamServer(IN SAM_HANDLE ServerHandle, IN PUNICODE_STRING Name, OUT PSID *DomainId) Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Thu Jun 7 10:31:17 2012 @@ -23,7 +23,7 @@ @ stub SamGetCompatibilityMode @ stub SamGetDisplayEnumerationIndex @ stub SamGetGroupsForUser -@ stub SamGetMembersInAlias +@ stdcall SamGetMembersInAlias(ptr ptr ptr) @ stub SamGetMembersInGroup @ stdcall SamLookupDomainInSamServer(ptr ptr ptr) @ stub SamLookupIdsInDomain Modified: trunk/reactos/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/database.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] Thu Jun 7 10:31:17 2012 @@ -44,210 +44,6 @@ return Status; } -#if 0 -static BOOLEAN -LsapIsDatabaseInstalled(VOID) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - HANDLE KeyHandle; - NTSTATUS Status; - - RtlInitUnicodeString(&KeyName, - L"Policy"); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - SecurityKeyHandle, - NULL); - - Status = RtlpNtOpenKey(&KeyHandle, - KEY_READ, - &ObjectAttributes, - 0); - if (!NT_SUCCESS(Status)) - return FALSE; - - NtClose(KeyHandle); - - return TRUE; -} - - -static NTSTATUS -LsapCreateDatabaseKeys(VOID) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - HANDLE PolicyKeyHandle = NULL; - HANDLE AccountsKeyHandle = NULL; - HANDLE DomainsKeyHandle = NULL; - HANDLE SecretsKeyHandle = NULL; - NTSTATUS Status = STATUS_SUCCESS; - - TRACE("LsapInstallDatabase()\n"); - - /* Create the 'Policy' key */ - RtlInitUnicodeString(&KeyName, - L"Policy"); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - SecurityKeyHandle, - NULL); - - Status = NtCreateKey(&PolicyKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - 0, - NULL); - if (!NT_SUCCESS(Status)) - { - ERR("Failed to create the 'Policy' key (Status: 0x%08lx)\n", Status); - goto Done; - } - - /* Create the 'Accounts' key */ - RtlInitUnicodeString(&KeyName, - L"Accounts"); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - PolicyKeyHandle, - NULL); - - Status = NtCreateKey(&AccountsKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - 0, - NULL); - if (!NT_SUCCESS(Status)) - { - ERR("Failed to create the 'Accounts' key (Status: 0x%08lx)\n", Status); - goto Done; - } - - /* Create the 'Domains' key */ - RtlInitUnicodeString(&KeyName, - L"Domains"); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - PolicyKeyHandle, - NULL); - - Status = NtCreateKey(&DomainsKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - 0, - NULL); - if (!NT_SUCCESS(Status)) - { - ERR("Failed to create the 'Domains' key (Status: 0x%08lx)\n", Status); - goto Done; - } - - /* Create the 'Secrets' key */ - RtlInitUnicodeString(&KeyName, - L"Secrets"); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - PolicyKeyHandle, - NULL); - - Status = NtCreateKey(&SecretsKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - 0, - NULL); - if (!NT_SUCCESS(Status)) - { - ERR("Failed to create the 'Secrets' key (Status: 0x%08lx)\n", Status); - goto Done; - } - -Done: - if (SecretsKeyHandle != NULL) - NtClose(SecretsKeyHandle); - - if (DomainsKeyHandle != NULL) - NtClose(DomainsKeyHandle); - - if (AccountsKeyHandle != NULL) - NtClose(AccountsKeyHandle); - - if (PolicyKeyHandle != NULL) - NtClose(PolicyKeyHandle); - - TRACE("LsapInstallDatabase() done (Status: 0x%08lx)\n", Status); - - return Status; -} - - -static NTSTATUS -LsapCreateDatabaseObjects(VOID) -{ - PLSA_DB_OBJECT PolicyObject; - NTSTATUS Status; - - /* Open the 'Policy' object */ - Status = LsapOpenDbObject(NULL, - L"Policy", - LsaDbPolicyObject, - 0, - &PolicyObject); - if (!NT_SUCCESS(Status)) - return Status; - - LsapSetObjectAttribute(PolicyObject, - L"PolPrDmN", - NULL, - 0); - - LsapSetObjectAttribute(PolicyObject, - L"PolPrDmS", - NULL, - 0); - - LsapSetObjectAttribute(PolicyObject, - L"PolAcDmN", - NULL, - 0); - - LsapSetObjectAttribute(PolicyObject, - L"PolAcDmS", - NULL, - 0); - - /* Close the 'Policy' object */ - LsapCloseDbObject(PolicyObject); - - return STATUS_SUCCESS; -} - - -static NTSTATUS -LsapUpdateDatabase(VOID) -{ - return STATUS_SUCCESS; -} -#endif - NTSTATUS SampInitDatabase(VOID) @@ -310,7 +106,8 @@ UNICODE_STRING KeyName; HANDLE ParentKeyHandle; HANDLE ContainerKeyHandle = NULL; - HANDLE ObjectKeyHandle; + HANDLE ObjectKeyHandle = NULL; + HANDLE MembersKeyHandle = NULL; NTSTATUS Status; if (DbObject == NULL) @@ -359,6 +156,28 @@ 0, NULL); + if ((ObjectType == SamDbAliasObject) || + (ObjectType == SamDbGroupObject)) + { + /* Open the object key */ + RtlInitUnicodeString(&KeyName, + L"Members"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + ContainerKeyHandle, + NULL); + + Status = NtCreateKey(&MembersKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + } + NtClose(ContainerKeyHandle); if (!NT_SUCCESS(Status)) @@ -395,15 +214,32 @@ sizeof(SAM_DB_OBJECT)); if (NewObject == NULL) { + if (MembersKeyHandle != NULL) + NtClose(MembersKeyHandle); NtClose(ObjectKeyHandle); return STATUS_NO_MEMORY; } + + NewObject->Name = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + (wcslen(ObjectName) + 1) * sizeof(WCHAR)); + if (NewObject == NULL) + { + if (MembersKeyHandle != NULL) + NtClose(MembersKeyHandle); + NtClose(ObjectKeyHandle); + RtlFreeHeap(RtlGetProcessHeap(), 0, NewObject); + return STATUS_NO_MEMORY; + } + + wcscpy(NewObject->Name, ObjectName); NewObject->Signature = SAMP_DB_SIGNATURE; NewObject->RefCount = 1; NewObject->ObjectType = ObjectType; NewObject->Access = DesiredAccess; NewObject->KeyHandle = ObjectKeyHandle; + NewObject->MembersKeyHandle = MembersKeyHandle; NewObject->ParentObject = ParentObject; if (ParentObject != NULL) @@ -428,7 +264,8 @@ UNICODE_STRING KeyName; HANDLE ParentKeyHandle; HANDLE ContainerKeyHandle = NULL; - HANDLE ObjectKeyHandle; + HANDLE ObjectKeyHandle = NULL; + HANDLE MembersKeyHandle = NULL; NTSTATUS Status; if (DbObject == NULL) @@ -473,6 +310,28 @@ KEY_ALL_ACCESS, &ObjectAttributes); + if ((ObjectType == SamDbAliasObject) || + (ObjectType == SamDbGroupObject)) + { + /* Open the object key */ + RtlInitUnicodeString(&KeyName, + L"Members"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + ContainerKeyHandle, + NULL); + + Status = NtCreateKey(&MembersKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + } + NtClose(ContainerKeyHandle); if (!NT_SUCCESS(Status)) @@ -506,15 +365,31 @@ sizeof(SAM_DB_OBJECT)); if (NewObject == NULL) { + if (MembersKeyHandle != NULL) + NtClose(MembersKeyHandle); NtClose(ObjectKeyHandle); return STATUS_NO_MEMORY; } + NewObject->Name = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + (wcslen(ObjectName) + 1) * sizeof(WCHAR)); + if (NewObject == NULL) + { + if (MembersKeyHandle != NULL) + NtClose(MembersKeyHandle); + NtClose(ObjectKeyHandle); + RtlFreeHeap(RtlGetProcessHeap(), 0, NewObject); + return STATUS_NO_MEMORY; + } + + wcscpy(NewObject->Name, ObjectName); NewObject->Signature = SAMP_DB_SIGNATURE; NewObject->RefCount = 1; NewObject->ObjectType = ObjectType; NewObject->Access = DesiredAccess; NewObject->KeyHandle = ObjectKeyHandle; + NewObject->MembersKeyHandle = MembersKeyHandle; NewObject->ParentObject = ParentObject; if (ParentObject != NULL) @@ -585,8 +460,14 @@ if (DbObject->KeyHandle != NULL) NtClose(DbObject->KeyHandle); + if (DbObject->MembersKeyHandle != NULL) + NtClose(DbObject->MembersKeyHandle); + if (DbObject->ParentObject != NULL) ParentObject = DbObject->ParentObject; + + if (DbObject->Name != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, DbObject->Name); RtlFreeHeap(RtlGetProcessHeap(), 0, DbObject); Modified: trunk/reactos/dll/win32/samsrv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/registry.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/registry.c [iso-8859-1] Thu Jun 7 10:31:17 2012 @@ -15,6 +15,14 @@ /* FUNCTIONS ***************************************************************/ +static +BOOLEAN +IsStringType(ULONG Type) +{ + return (Type == REG_SZ) || (Type == REG_EXPAND_SZ) || (Type == REG_MULTI_SZ); +} + + NTSTATUS SampRegCloseKey(IN HANDLE KeyHandle) { @@ -132,32 +140,148 @@ NTSTATUS -SampRegSetValue(HANDLE KeyHandle, - LPWSTR ValueName, - ULONG Type, - LPVOID Data, - ULONG DataLength) -{ - UNICODE_STRING Name; - - RtlInitUnicodeString(&Name, - ValueName); - - return ZwSetValueKey(KeyHandle, - &Name, - 0, - Type, - Data, - DataLength); -} - - -NTSTATUS -SampRegQueryValue(HANDLE KeyHandle, - LPWSTR ValueName, - PULONG Type OPTIONAL, - LPVOID Data OPTIONAL, - PULONG DataLength OPTIONAL) +SampRegQueryKeyInfo(IN HANDLE KeyHandle, + OUT PULONG SubKeyCount, + OUT PULONG ValueCount) +{ + KEY_FULL_INFORMATION FullInfoBuffer; + ULONG Length; + NTSTATUS Status; + + FullInfoBuffer.ClassLength = 0; + FullInfoBuffer.ClassOffset = FIELD_OFFSET(KEY_FULL_INFORMATION, Class); + + Status = NtQueryKey(KeyHandle, + KeyFullInformation, + &FullInfoBuffer, + sizeof(KEY_FULL_INFORMATION), + &Length); + TRACE("NtQueryKey() returned status 0x%08lX\n", Status); + if (!NT_SUCCESS(Status)) + return Status; + + if (SubKeyCount != NULL) + *SubKeyCount = FullInfoBuffer.SubKeys; + + if (ValueCount != NULL) + *ValueCount = FullInfoBuffer.Values; + + return Status; +} + + +NTSTATUS +SampRegEnumerateValue(IN HANDLE KeyHandle, + IN ULONG Index, + OUT LPWSTR Name, + IN OUT PULONG NameLength, + OUT PULONG Type OPTIONAL, + OUT PVOID Data OPTIONAL, + IN OUT PULONG DataLength OPTIONAL) +{ + PKEY_VALUE_FULL_INFORMATION ValueInfo = NULL; + ULONG BufferLength = 0; + ULONG ReturnedLength; + NTSTATUS Status; + + TRACE("Index: %lu\n", Index); + + /* Calculate the required buffer length */ + BufferLength = FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name); + BufferLength += (MAX_PATH + 1) * sizeof(WCHAR); + if (Data != NULL) + BufferLength += *DataLength; + + /* Allocate the value buffer */ + ValueInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); + if (ValueInfo == NULL) + return STATUS_NO_MEMORY; + + /* Enumerate the value*/ + Status = ZwEnumerateValueKey(KeyHandle, + Index, + KeyValueFullInformation, + ValueInfo, + BufferLength, + &ReturnedLength); + if (NT_SUCCESS(Status)) + { + if (Name != NULL) + { + /* Check if the name fits */ + if (ValueInfo->NameLength < (*NameLength * sizeof(WCHAR))) + { + /* Copy it */ + RtlMoveMemory(Name, + ValueInfo->Name, + ValueInfo->NameLength); + + /* Terminate the string */ + Name[ValueInfo->NameLength / sizeof(WCHAR)] = 0; + } + else + { + /* Otherwise, we ran out of buffer space */ + Status = STATUS_BUFFER_OVERFLOW; + goto done; + } + } + + if (Data != NULL) + { + /* Check if the data fits */ + if (ValueInfo->DataLength <= *DataLength) + { + /* Copy it */ + RtlMoveMemory(Data, + (PVOID)((ULONG_PTR)ValueInfo + ValueInfo->DataOffset), + ValueInfo->DataLength); + + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + if (IsStringType(ValueInfo->Type) && + ValueInfo->DataLength <= *DataLength - sizeof(WCHAR)) + { + WCHAR *ptr = (WCHAR *)((ULONG_PTR)Data + ValueInfo->DataLength); + if ((ptr > (WCHAR *)Data) && ptr[-1]) + *ptr = 0; + } + } + else + { + Status = STATUS_BUFFER_OVERFLOW; + goto done; + } + } + } + +done: + if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW)) + { + if (Type != NULL) + *Type = ValueInfo->Type; + + if (NameLength != NULL) + *NameLength = ValueInfo->NameLength; + + if (DataLength != NULL) + *DataLength = ValueInfo->DataLength; + } + + /* Free the buffer and return status */ + if (ValueInfo) + RtlFreeHeap(RtlGetProcessHeap(), 0, ValueInfo); + + return Status; +} + + +NTSTATUS +SampRegQueryValue(IN HANDLE KeyHandle, + IN LPWSTR ValueName, + OUT PULONG Type OPTIONAL, + OUT PVOID Data OPTIONAL, + IN OUT PULONG DataLength OPTIONAL) { PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; UNICODE_STRING Name; @@ -200,6 +324,16 @@ RtlMoveMemory(Data, ValueInfo->Data, ValueInfo->DataLength); + + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + if (IsStringType(ValueInfo->Type) && + ValueInfo->DataLength <= *DataLength - sizeof(WCHAR)) + { + WCHAR *ptr = (WCHAR *)((ULONG_PTR)Data + ValueInfo->DataLength); + if ((ptr > (WCHAR *)Data) && ptr[-1]) + *ptr = 0; + } } /* Free the memory and return status */ @@ -210,3 +344,24 @@ return Status; } + + +NTSTATUS +SampRegSetValue(HANDLE KeyHandle, + LPWSTR ValueName, + ULONG Type, + LPVOID Data, + ULONG DataLength) +{ + UNICODE_STRING Name; + + RtlInitUnicodeString(&Name, + ValueName); + + return ZwSetValueKey(KeyHandle, + &Name, + 0, + Type, + Data, + DataLength); +} Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Thu Jun 7 10:31:17 2012 @@ -1186,6 +1186,8 @@ PSAM_DB_OBJECT AliasObject; LPWSTR MemberIdString = NULL; HANDLE MembersKeyHandle = NULL; + HANDLE MemberKeyHandle = NULL; + ULONG MemberIdLength; NTSTATUS Status; TRACE("SamrAddMemberToAlias(%p %p)\n", @@ -1205,6 +1207,8 @@ ConvertSidToStringSidW(MemberId, &MemberIdString); TRACE("Member SID: %S\n", MemberIdString); + MemberIdLength = RtlLengthSid(MemberId); + Status = SampRegCreateKey(AliasObject->KeyHandle, L"Members", KEY_WRITE, @@ -1218,10 +1222,39 @@ Status = SampRegSetValue(MembersKeyHandle, MemberIdString, REG_BINARY, - NULL, - 0); + MemberId, + MemberIdLength); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegSetValue failed with status 0x%08lx\n", Status); + goto done; + } + + Status = SampRegCreateKey(AliasObject->MembersKeyHandle, + MemberIdString, + KEY_WRITE, + &MemberKeyHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegCreateKey failed with status 0x%08lx\n", Status); + goto done; + } + + Status = SampRegSetValue(MemberKeyHandle, + AliasObject->Name, + REG_BINARY, + MemberId, + MemberIdLength); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRegSetValue failed with status 0x%08lx\n", Status); + goto done; + } done: + if (MemberKeyHandle != NULL) + SampRegCloseKey(MemberKeyHandle); + if (MembersKeyHandle != NULL) SampRegCloseKey(MembersKeyHandle); @@ -1247,8 +1280,129 @@ SamrGetMembersInAlias(IN SAMPR_HANDLE AliasHandle, OUT PSAMPR_PSID_ARRAY_OUT Members) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT AliasObject; + HANDLE MembersKeyHandle = NULL; + PSAMPR_SID_INFORMATION MemberArray = NULL; + ULONG ValueCount = 0; + ULONG DataLength; + ULONG Index; + NTSTATUS Status; + + TRACE("SamrGetMembersInAlias(%p %p %p)\n", + AliasHandle, Members); + + /* Validate the alias handle */ + Status = SampValidateDbObject(AliasHandle, + SamDbAliasObject, + ALIAS_LIST_MEMBERS, + &AliasObject); + if (!NT_SUCCESS(Status)) + { + ERR("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Open the members key of the alias objct */ + Status = SampRegOpenKey(AliasObject->KeyHandle, + L"Members", + KEY_READ, + &MembersKeyHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SampRegOpenKey failed with status 0x%08lx\n", Status); + return Status; + } + + /* Get the number of members */ + Status = SampRegQueryKeyInfo(MembersKeyHandle, + NULL, + &ValueCount); + if (!NT_SUCCESS(Status)) + { + ERR("SampRegQueryKeyInfo failed with status 0x%08lx\n", Status); + goto done; + } + + /* Allocate the member array */ + MemberArray = midl_user_allocate(ValueCount * sizeof(SAMPR_SID_INFORMATION)); + if (MemberArray == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* Enumerate the members */ + Index = 0; + while (TRUE) + { + /* Get the size of the next SID */ + DataLength = 0; + Status = SampRegEnumerateValue(MembersKeyHandle, + Index, + NULL, + NULL, + NULL, + NULL, + &DataLength); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_SUCCESS; + break; + } + + /* Allocate a buffer for the SID */ + MemberArray[Index].SidPointer = midl_user_allocate(DataLength); + if (MemberArray[Index].SidPointer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* Read the SID into the buffer */ + Status = SampRegEnumerateValue(MembersKeyHandle, + Index, + NULL, + NULL, + NULL, + (PVOID)MemberArray[Index].SidPointer, + &DataLength); + if (!NT_SUCCESS(Status)) + { + goto done; + } + + Index++; + } + + /* Return the number of members and the member array */ + if (NT_SUCCESS(Status)) + { + Members->Count = ValueCount; + Members->Sids = MemberArray; + } + +done: + /* Clean up the members array and the SID buffers if something failed */ + if (!NT_SUCCESS(Status)) + { + if (MemberArray != NULL) + { + for (Index = 0; Index < ValueCount; Index++) + { + if (MemberArray[Index].SidPointer != NULL) + midl_user_free(MemberArray[Index].SidPointer); + } + + midl_user_free(MemberArray); + } + } + + /* Close the members key */ + if (MembersKeyHandle != NULL) + SampRegCloseKey(MembersKeyHandle); + + return Status; } /* Function 34 */ Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Thu Jun 7 10:31:17 2012 @@ -42,7 +42,9 @@ SAM_DB_OBJECT_TYPE ObjectType; ULONG RefCount; ACCESS_MASK Access; + LPWSTR Name; HANDLE KeyHandle; + HANDLE MembersKeyHandle; // only used by Aliases and Groups struct _SAM_DB_OBJECT *ParentObject; } SAM_DB_OBJECT, *PSAM_DB_OBJECT; @@ -127,6 +129,20 @@ OUT HANDLE KeyHandle); NTSTATUS +SampRegQueryKeyInfo(IN HANDLE KeyHandle, + OUT PULONG SubKeyCount, + OUT PULONG ValueCount); + +NTSTATUS +SampRegEnumerateValue(IN HANDLE KeyHandle, + IN ULONG Index, + OUT LPWSTR Name, + IN OUT PULONG NameLength, + OUT PULONG Type OPTIONAL, + OUT PVOID Data OPTIONAL, + IN OUT PULONG DataLength OPTIONAL); + +NTSTATUS SampRegQueryValue(IN HANDLE KeyHandle, IN LPWSTR ValueName, OUT PULONG Type OPTIONAL, Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=56… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Thu Jun 7 10:31:17 2012 @@ -166,6 +166,12 @@ NTSTATUS NTAPI +SamGetMembersInAlias(IN SAM_HANDLE AliasHandle, + OUT PSID **MemberIds, + OUT PULONG MemberCount); + +NTSTATUS +NTAPI SamLookupDomainInSamServer(IN SAM_HANDLE ServerHandle, IN PUNICODE_STRING Name, OUT PSID *DomainId);

12 years, 6 months

[jimtabor] 56703: [Win32k] - Fast fix attach thread input. Tested with win Msg test_SetFocus, fixed the WM_ACTIVATE issue, still needs more testing. See bug 7098, used the test case and it works.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jun 7 01:08:41 2012 New Revision: 56703 URL: http://svn.reactos.org/svn/reactos?rev=56703&view=rev Log: [Win32k] - Fast fix attach thread input. Tested with win Msg test_SetFocus, fixed the WM_ACTIVATE issue, still needs more testing. See bug 7098, used the test case and it works. Modified: trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/input.c Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Thu Jun 7 01:08:41 2012 @@ -595,8 +595,14 @@ } } - /* check if the specified window can be set in the input data of a given queue */ - if ( !Window || ThreadQueue == Window->head.pti->MessageQueue) + // Check again! SetActiveWindow could have set the focus via WM_ACTIVATE. + if (ThreadQueue->spwndFocus && ThreadQueue->spwndFocus == Window) + { + hWndPrev = UserHMGetHandle(ThreadQueue->spwndFocus); + } + + /* check if the specified window can be set in the input data of a given queue */ + if (ThreadQueue == Window->head.pti->MessageQueue) /* set the current thread focus window */ ThreadQueue->spwndFocus = Window; Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Thu Jun 7 01:08:41 2012 @@ -395,17 +395,17 @@ } BOOL FASTCALL -UserAttachThreadInput(PTHREADINFO pti, PTHREADINFO ptiTo, BOOL fAttach) +UserAttachThreadInput(PTHREADINFO ptiFrom, PTHREADINFO ptiTo, BOOL fAttach) { PATTACHINFO pai; /* Can not be the same thread. */ - if (pti == ptiTo) return FALSE; + if (ptiFrom == ptiTo) return FALSE; /* Do not attach to system threads or between different desktops. */ - if (pti->TIF_flags & TIF_DONTATTACHQUEUE || + if (ptiFrom->TIF_flags & TIF_DONTATTACHQUEUE || ptiTo->TIF_flags & TIF_DONTATTACHQUEUE || - pti->rpdesk != ptiTo->rpdesk) + ptiFrom->rpdesk != ptiTo->rpdesk) return FALSE; /* If Attach set, allocate and link. */ @@ -415,9 +415,16 @@ if (!pai) return FALSE; pai->paiNext = gpai; - pai->pti1 = pti; + pai->pti1 = ptiFrom; pai->pti2 = ptiTo; gpai = pai; + ERR("Attach Allocated! ptiFrom 0x%p ptiTo 0x%p\n",ptiFrom,ptiTo); + + ptiFrom->pqAttach = ptiFrom->MessageQueue; + ptiFrom->MessageQueue = ptiTo->MessageQueue; + // FIXME: conditions? + ptiFrom->MessageQueue->spwndActive = ptiFrom->pqAttach->spwndActive; + ptiFrom->MessageQueue->spwndFocus = ptiFrom->pqAttach->spwndFocus; } else /* If clear, unlink and free it. */ { @@ -430,7 +437,7 @@ /* Search list and free if found or return false. */ do { - if (pai->pti2 == ptiTo && pai->pti1 == pti) break; + if (pai->pti2 == ptiTo && pai->pti1 == ptiFrom) break; paiprev = pai; pai = pai->paiNext; } while (pai); @@ -440,8 +447,19 @@ if (paiprev) paiprev->paiNext = pai->paiNext; ExFreePoolWithTag(pai, USERTAG_ATTACHINFO); - } - + ERR("Attach Free! ptiFrom 0x%p ptiTo 0x%p\n",ptiFrom,ptiTo); + + ptiFrom->MessageQueue = ptiFrom->pqAttach; + // FIXME: conditions? + ptiFrom->MessageQueue->spwndActive = NULL; + ptiFrom->MessageQueue->spwndFocus = NULL; + ptiFrom->pqAttach = NULL; + } + /* Note that key state, which can be ascertained by calls to the GetKeyState + or GetKeyboardState function, is reset after a call to AttachThreadInput. + ATM which one? + */ + RtlCopyMemory(ptiTo->MessageQueue->afKeyState, gafAsyncKeyState, sizeof(gafAsyncKeyState)); return TRUE; }

12 years, 6 months

[arty] 56701: [NTOSKRNL] Don't crash when unmapping a kernel-space image section, due to dereferencing a NULL Process.

by arty＠svn.reactos.org

Author: arty Date: Wed Jun 6 21:22:19 2012 New Revision: 56701 URL: http://svn.reactos.org/svn/reactos?rev=56701&view=rev Log: [NTOSKRNL] Don't crash when unmapping a kernel-space image section, due to dereferencing a NULL Process. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Jun 6 21:22:19 2012 @@ -4105,7 +4105,7 @@ ASSERT(Process); - AddressSpace = &Process->Vm; + AddressSpace = Process ? &Process->Vm : MmGetKernelAddressSpace(); MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace,

12 years, 6 months

[akhaldi] 56700: [HIDCLASS] * Add a missing break, preventing a null pointer dereference. CID 515263.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jun 6 15:41:08 2012 New Revision: 56700 URL: http://svn.reactos.org/svn/reactos?rev=56700&view=rev Log: [HIDCLASS] * Add a missing break, preventing a null pointer dereference. CID 515263. Modified: trunk/reactos/drivers/hid/hidclass/pdo.c Modified: trunk/reactos/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/pdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] Wed Jun 6 15:41:08 2012 @@ -420,6 +420,7 @@ // invalid request // Status = STATUS_DEVICE_CONFIGURATION_ERROR; + break; } //

12 years, 6 months

[jgardou] 56699: [FREELDR] * Handle case when non-existing channel is asked for debug tracing CID 701362

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Jun 6 15:33:21 2012 New Revision: 56699 URL: http://svn.reactos.org/svn/reactos?rev=56699&view=rev Log: [FREELDR] * Handle case when non-existing channel is asked for debug tracing CID 701362 Modified: trunk/reactos/boot/freeldr/freeldr/debug.c Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Wed Jun 6 15:33:21 2012 @@ -303,6 +303,7 @@ return TRUE; } + else return FALSE; if(op==L'+') DbgChannels[iChannel] |= iLevel;

12 years, 6 months

[osiejka] 56697: [TRANSLATION] - brasilian portugeese translation by Matheus Macabu (bug no. 7079); [AHK] - add scripts for including AHK tests into Reactos\Bin;

by osiejka＠svn.reactos.org

Author: osiejka Date: Tue Jun 5 14:37:58 2012 New Revision: 56697 URL: http://svn.reactos.org/svn/reactos?rev=56697&view=rev Log: [TRANSLATION] - brasilian portugeese translation by Matheus Macabu (bug no. 7079); [AHK] - add scripts for including AHK tests into Reactos\Bin; Added: trunk/reactos/base/applications/magnify/lang/pt-BR.rc (with props) trunk/reactos/base/applications/mscutils/devmgmt/lang/pt-BR.rc (with props) trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc (with props) trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc (with props) trunk/reactos/base/applications/notepad/lang/pt-BR.rc (with props) trunk/reactos/base/applications/screensavers/logon/lang/pt-BR.rc (with props) trunk/reactos/base/setup/vmwinst/lang/pt-BR.rc (with props) trunk/reactos/base/system/winlogon/lang/pt-BR.rc (with props) trunk/reactos/boot/bootdata/bootcdregtest/AHKAppTests.cmd (with props) trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc (with props) trunk/reactos/win32ss/user/user32/lang/pt-BR.rc (with props) trunk/reactos/win32ss/user/win32csr/lang/pt-BR.rc (with props) Modified: trunk/reactos/base/applications/magnify/rsrc.rc trunk/reactos/base/applications/mplay32/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc trunk/reactos/base/applications/notepad/lang/pt-PT.rc trunk/reactos/base/applications/notepad/rsrc.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/sndvol32/lang/pt-BR.rc trunk/reactos/base/setup/reactos/lang/pt-BR.rc trunk/reactos/base/setup/vmwinst/rsrc.rc trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc trunk/reactos/base/system/winlogon/rsrc.rc trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/dll/cpl/appwiz/rsrc.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/win32ss/user/user32/user32.rc trunk/reactos/win32ss/user/win32csr/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/applications/magnify/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/mplay32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Added: trunk/reactos/base/applications/mscutils/devmgmt/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/notepad/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Added: trunk/reactos/base/applications/screensavers/logon/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/sndvol32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/setup/reactos/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pt… Added: trunk/reactos/base/setup/vmwinst/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/pt… Modified: trunk/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/rsrc.rc… Modified: trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Added: trunk/reactos/base/system/winlogon/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/rsrc.… Added: trunk/reactos/boot/bootdata/bootcdregtest/AHKAppTests.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… Modified: trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Added: trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pt-BR.… Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Added: trunk/reactos/win32ss/user/user32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/p… Modified: trunk/reactos/win32ss/user/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/user32… Added: trunk/reactos/win32ss/user/win32csr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/lang… Modified: trunk/reactos/win32ss/user/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/rsrc…

12 years, 6 months

[akhaldi] 56695: [SERVICES] * Remove logically dead code. CID 513302.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 4 15:28:48 2012 New Revision: 56695 URL: http://svn.reactos.org/svn/reactos?rev=56695&view=rev Log: [SERVICES] * Remove logically dead code. CID 513302. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Mon Jun 4 15:28:48 2012 @@ -1237,9 +1237,6 @@ sizeof(SERVICE_STATUS)); } - if ((dwError == ERROR_SUCCESS) && (pcbBytesNeeded)) - dwError = ERROR_DEPENDENT_SERVICES_RUNNING; - return dwError; }

12 years, 6 months

[akhaldi] 56693: [MSCOREE_WINETEST] * Sync to Wine 1.5.4.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 4 10:47:09 2012 New Revision: 56693 URL: http://svn.reactos.org/svn/reactos?rev=56693&view=rev Log: [MSCOREE_WINETEST] * Sync to Wine 1.5.4. Modified: trunk/rostests/winetests/mscoree/mscoree.c Modified: trunk/rostests/winetests/mscoree/mscoree.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mscoree/mscoree… ============================================================================== --- trunk/rostests/winetests/mscoree/mscoree.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mscoree/mscoree.c [iso-8859-1] Mon Jun 4 10:47:09 2012 @@ -60,8 +60,12 @@ static void test_versioninfo(void) { + const WCHAR v9_0[] = {'v','9','.','0','.','3','0','3','1','9',0}; + const WCHAR v2_0cap[] = {'V','2','.','0','.','5','0','7','2','7',0}; const WCHAR v2_0[] = {'v','2','.','0','.','5','0','7','2','7',0}; + const WCHAR v2_0_0[] = {'v','2','.','0','.','0',0}; const WCHAR v1_1[] = {'v','1','.','1','.','4','3','2','2',0}; + const WCHAR v1_1_0[] = {'v','1','.','1','.','0',0}; WCHAR version[MAX_PATH]; WCHAR path[MAX_PATH]; @@ -141,6 +145,45 @@ /* With NULL-pointer for bufferlength, the buffer itself still gets filled with correct string */ memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v2_0cap, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(!winetest_strcmpW(version, v2_0cap), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0cap)); + + /* Invalid Version and RUNTIME_INFO_UPGRADE_VERSION flag*/ + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v1_1, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == S_OK || hr == CLR_E_SHIM_RUNTIME , "GetRequestedRuntimeInfo returned %08x\n", hr); + if(hr == S_OK) + { + /* .NET 1.1 may not be installed. */ + ok(!winetest_strcmpW(version, v1_1) || !winetest_strcmpW(version, v2_0), + "version is %s , expected %s or %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v1_1), wine_dbgstr_w(v2_0)); + + } + + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v9_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr); + + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v1_1_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr); + + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v1_1_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr); + + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); }

12 years, 6 months

[akhaldi] 56692: [MSCOREE] * Sync to Wine 1.5.4.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 4 10:46:54 2012 New Revision: 56692 URL: http://svn.reactos.org/svn/reactos?rev=56692&view=rev Log: [MSCOREE] * Sync to Wine 1.5.4. Modified: trunk/reactos/dll/win32/mscoree/CMakeLists.txt trunk/reactos/dll/win32/mscoree/assembly.c trunk/reactos/dll/win32/mscoree/config.c trunk/reactos/dll/win32/mscoree/corruntimehost.c trunk/reactos/dll/win32/mscoree/metahost.c trunk/reactos/dll/win32/mscoree/mscoree.spec trunk/reactos/dll/win32/mscoree/mscoree_main.c trunk/reactos/dll/win32/mscoree/mscoree_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mscoree/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -2,7 +2,9 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -set_rc_compiler() +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + spec2def(mscoree.dll mscoree.spec) list(APPEND SOURCE Modified: trunk/reactos/dll/win32/mscoree/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/assembly… ============================================================================== --- trunk/reactos/dll/win32/mscoree/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/assembly.c [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -63,10 +63,13 @@ struct tagASSEMBLY { + int is_mapped_file; + + /* mapped files */ LPWSTR path; - HANDLE hfile; HANDLE hmap; + BYTE *data; IMAGE_NT_HEADERS *nthdr; @@ -87,6 +90,29 @@ lstrcpyW(dest, src); return dest; +} + +static void* assembly_rva_to_va(ASSEMBLY *assembly, ULONG rva) +{ + if (assembly->is_mapped_file) + return ImageRvaToVa(assembly->nthdr, assembly->data, rva, NULL); + else + return assembly->data + rva; +} + +static ULONG assembly_datadir_get_data(ASSEMBLY *assembly, + IMAGE_DATA_DIRECTORY *datadir, void **data) +{ + if (!datadir->VirtualAddress || !datadir->Size) + { + *data = NULL; + return 0; + } + else + { + *data = assembly_rva_to_va(assembly, datadir->VirtualAddress); + return datadir->Size; + } } static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz) @@ -97,7 +123,7 @@ ULONG rva; rva = assembly->corhdr->MetaData.VirtualAddress; - ptr = ImageRvaToVa(assembly->nthdr, assembly->data, rva, NULL); + ptr = assembly_rva_to_va(assembly, rva); if (!ptr) return E_FAIL; @@ -158,18 +184,22 @@ if (!datadirs) return E_FAIL; - if (!datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress || - !datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size) - { + if (!assembly_datadir_get_data(assembly, &datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR], (void**)&assembly->corhdr)) return E_FAIL; - } - - assembly->corhdr = ImageRvaToVa(assembly->nthdr, assembly->data, - datadirs[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress, NULL); - if (!assembly->corhdr) - return E_FAIL; - - return S_OK; + + return S_OK; +} + +static HRESULT parse_headers(ASSEMBLY *assembly) +{ + HRESULT hr; + + hr = parse_pe_header(assembly); + + if (SUCCEEDED(hr)) + hr = parse_clr_metadata(assembly); + + return hr; } HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) @@ -183,6 +213,8 @@ if (!assembly) return E_OUTOFMEMORY; + assembly->is_mapped_file = 1; + assembly->path = strdupW(file); if (!assembly->path) { @@ -213,10 +245,7 @@ goto failed; } - hr = parse_pe_header(assembly); - if (FAILED(hr)) goto failed; - - hr = parse_clr_metadata(assembly); + hr = parse_headers(assembly); if (FAILED(hr)) goto failed; *out = assembly; @@ -227,16 +256,43 @@ return hr; } +HRESULT assembly_from_hmodule(ASSEMBLY **out, HMODULE hmodule) +{ + ASSEMBLY *assembly; + HRESULT hr; + + *out = NULL; + + assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY)); + if (!assembly) + return E_OUTOFMEMORY; + + assembly->is_mapped_file = 0; + + assembly->data = (BYTE*)hmodule; + + hr = parse_headers(assembly); + if (SUCCEEDED(hr)) + *out = assembly; + else + assembly_release(assembly); + + return hr; +} + HRESULT assembly_release(ASSEMBLY *assembly) { if (!assembly) return S_OK; + if (assembly->is_mapped_file) + { + UnmapViewOfFile(assembly->data); + CloseHandle(assembly->hmap); + CloseHandle(assembly->hfile); + } HeapFree(GetProcessHeap(), 0, assembly->metadatahdr); HeapFree(GetProcessHeap(), 0, assembly->path); - UnmapViewOfFile(assembly->data); - CloseHandle(assembly->hmap); - CloseHandle(assembly->hfile); HeapFree(GetProcessHeap(), 0, assembly); return S_OK; @@ -248,3 +304,13 @@ return S_OK; } + +HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) +{ + ULONG size; + + size = assembly_datadir_get_data(assembly, &assembly->corhdr->VTableFixups, (void**)fixups); + *count = size / sizeof(VTableFixup); + + return S_OK; +} Modified: trunk/reactos/dll/win32/mscoree/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/config.c… ============================================================================== --- trunk/reactos/dll/win32/mscoree/config.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/config.c [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -425,7 +425,7 @@ ISAXXMLReader_Release(reader); } - IUnknown_Release((IUnknown*)handler); + ISAXContentHandler_Release(&handler->ISAXContentHandler_iface); return S_OK; } @@ -445,7 +445,7 @@ if (SUCCEEDED(hr)) { - V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; hr = parse_config(var, result); Modified: trunk/reactos/dll/win32/mscoree/corruntimehost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/corrunti… ============================================================================== --- trunk/reactos/dll/win32/mscoree/corruntimehost.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/corruntimehost.c [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -19,6 +19,7 @@ #define COBJMACROS +#include <assert.h> #include <stdarg.h> #include "windef.h" @@ -38,6 +39,8 @@ #include "mscoree_private.h" #include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); @@ -49,6 +52,21 @@ { struct list entry; MonoDomain *domain; +}; + +static HANDLE dll_fixup_heap; /* using a separate heap so we can have execute permission */ + +static struct list dll_fixups; + +struct dll_fixup +{ + struct list entry; + int done; + HMODULE dll; + void *thunk_code; /* pointer into dll_fixup_heap */ + VTableFixup *fixup; + void *vtable; + void *tokens; /* pointer into process heap */ }; static HRESULT RuntimeHost_AddDomain(RuntimeHost *This, MonoDomain **result) @@ -146,6 +164,8 @@ MonoMethod *method; MonoObject *appdomain_object; IUnknown *unk; + + This->mono->mono_thread_attach(domain); assembly = This->mono->mono_domain_assembly_open(domain, "mscorlib"); if (!assembly) @@ -559,6 +579,8 @@ hr = E_FAIL; + This->mono->mono_thread_attach(domain); + filenameA = WtoA(pwzAssemblyPath); assembly = This->mono->mono_domain_assembly_open(domain, filenameA); if (!assembly) @@ -609,14 +631,10 @@ } cleanup: - if(filenameA) - HeapFree(GetProcessHeap(), 0, filenameA); - if(classA) - HeapFree(GetProcessHeap(), 0, classA); - if(argsA) - HeapFree(GetProcessHeap(), 0, argsA); - if(methodA) - HeapFree(GetProcessHeap(), 0, methodA); + HeapFree(GetProcessHeap(), 0, filenameA); + HeapFree(GetProcessHeap(), 0, classA); + HeapFree(GetProcessHeap(), 0, argsA); + HeapFree(GetProcessHeap(), 0, methodA); return hr; } @@ -661,6 +679,8 @@ if (SUCCEEDED(hr)) { + This->mono->mono_thread_attach(domain); + type = This->mono->mono_reflection_type_from_name(nameA, NULL); if (!type) { @@ -708,7 +728,9 @@ * * NOTE: The IUnknown* is created with a reference to the object. * Until they have a reference, objects must be in the stack to prevent the - * garbage collector from freeing them. */ + * garbage collector from freeing them. + * + * mono_thread_attach must have already been called for this thread. */ HRESULT RuntimeHost_GetIUnknownForObject(RuntimeHost *This, MonoObject *obj, IUnknown **ppUnk) { @@ -798,13 +820,223 @@ HeapFree(GetProcessHeap(), 0, argvw); } +#if __i386__ + +# define CAN_FIXUP_VTABLE 1 + +#include "pshpack1.h" + +struct vtable_fixup_thunk +{ + /* sub $0x4,%esp */ + BYTE i1[3]; + /* mov fixup,(%esp) */ + BYTE i2[3]; + struct dll_fixup *fixup; + /* mov function,%eax */ + BYTE i3; + void (CDECL *function)(struct dll_fixup *); + /* call *%eax */ + BYTE i4[2]; + /* pop %eax */ + BYTE i5; + /* jmp *vtable_entry */ + BYTE i6[2]; + void *vtable_entry; +}; + +static const struct vtable_fixup_thunk thunk_template = { + {0x83,0xec,0x04}, + {0xc7,0x04,0x24}, + NULL, + 0xb8, + NULL, + {0xff,0xd0}, + 0x58, + {0xff,0x25}, + NULL +}; + +#include "poppack.h" + +#else /* !defined(__i386__) */ + +# define CAN_FIXUP_VTABLE 0 + +struct vtable_fixup_thunk +{ + struct dll_fixup *fixup; + void (CDECL *function)(struct dll_fixup *fixup); + void *vtable_entry; +}; + +static const struct vtable_fixup_thunk thunk_template = {0}; + +#endif + +static void CDECL ReallyFixupVTable(struct dll_fixup *fixup) +{ + HRESULT hr=S_OK; + WCHAR filename[MAX_PATH]; + ICLRRuntimeInfo *info=NULL; + RuntimeHost *host; + char *filenameA; + MonoImage *image=NULL; + MonoAssembly *assembly=NULL; + MonoImageOpenStatus status=0; + MonoDomain *domain; + + if (fixup->done) return; + + /* It's possible we'll have two threads doing this at once. This is + * considered preferable to the potential deadlock if we use a mutex. */ + + GetModuleFileNameW(fixup->dll, filename, MAX_PATH); + + TRACE("%p,%p,%s\n", fixup, fixup->dll, debugstr_w(filename)); + + filenameA = WtoA(filename); + if (!filenameA) + hr = E_OUTOFMEMORY; + + if (SUCCEEDED(hr)) + hr = get_runtime_info(filename, NULL, NULL, 0, 0, FALSE, &info); + + if (SUCCEEDED(hr)) + hr = ICLRRuntimeInfo_GetRuntimeHost(info, &host); + + if (SUCCEEDED(hr)) + hr = RuntimeHost_GetDefaultDomain(host, &domain); + + if (SUCCEEDED(hr)) + { + host->mono->mono_thread_attach(domain); + + image = host->mono->mono_image_open_from_module_handle(fixup->dll, + filenameA, 1, &status); + } + + if (image) + assembly = host->mono->mono_assembly_load_from(image, filenameA, &status); + + if (assembly) + { + int i; + + /* Mono needs an image that belongs to an assembly. */ + image = host->mono->mono_assembly_get_image(assembly); + + if (fixup->fixup->type & COR_VTABLE_32BIT) + { + DWORD *vtable = fixup->vtable; + DWORD *tokens = fixup->tokens; + for (i=0; i<fixup->fixup->count; i++) + { + TRACE("%x\n", tokens[i]); + vtable[i] = PtrToUint(host->mono->mono_marshal_get_vtfixup_ftnptr( + image, tokens[i], fixup->fixup->type)); + } + } + + fixup->done = 1; + } + + if (info != NULL) + ICLRRuntimeHost_Release(info); + + HeapFree(GetProcessHeap(), 0, filenameA); + + if (!fixup->done) + { + ERR("unable to fixup vtable, hr=%x, status=%d\n", hr, status); + /* If we returned now, we'd get an infinite loop. */ + assert(0); + } +} + +static void FixupVTableEntry(HMODULE hmodule, VTableFixup *vtable_fixup) +{ + /* We can't actually generate code for the functions without loading mono, + * and loading mono inside DllMain is a terrible idea. So we make thunks + * that call ReallyFixupVTable, which will load the runtime and fill in the + * vtable, then do an indirect jump using the (now filled in) vtable. Note + * that we have to keep the thunks around forever, as one of them may get + * called while we're filling in the table, and we can never be sure all + * threads are clear. */ + struct dll_fixup *fixup; + + fixup = HeapAlloc(GetProcessHeap(), 0, sizeof(*fixup)); + + fixup->dll = hmodule; + fixup->thunk_code = HeapAlloc(dll_fixup_heap, 0, sizeof(struct vtable_fixup_thunk) * vtable_fixup->count); + fixup->fixup = vtable_fixup; + fixup->vtable = (BYTE*)hmodule + vtable_fixup->rva; + fixup->done = 0; + + if (vtable_fixup->type & COR_VTABLE_32BIT) + { + DWORD *vtable = fixup->vtable; + DWORD *tokens; + int i; + struct vtable_fixup_thunk *thunks = fixup->thunk_code; + + if (sizeof(void*) > 4) + ERR("32-bit fixup in 64-bit mode; broken image?\n"); + + tokens = fixup->tokens = HeapAlloc(GetProcessHeap(), 0, sizeof(*tokens) * vtable_fixup->count); + memcpy(tokens, vtable, sizeof(*tokens) * vtable_fixup->count); + for (i=0; i<vtable_fixup->count; i++) + { + memcpy(&thunks[i], &thunk_template, sizeof(thunk_template)); + thunks[i].fixup = fixup; + thunks[i].function = ReallyFixupVTable; + thunks[i].vtable_entry = &vtable[i]; + vtable[i] = PtrToUint(&thunks[i]); + } + } + else + { + ERR("unsupported vtable fixup flags %x\n", vtable_fixup->type); + HeapFree(dll_fixup_heap, 0, fixup->thunk_code); + HeapFree(GetProcessHeap(), 0, fixup); + return; + } + + list_add_tail(&dll_fixups, &fixup->entry); +} + +static void FixupVTable(HMODULE hmodule) +{ + ASSEMBLY *assembly; + HRESULT hr; + VTableFixup *vtable_fixups; + ULONG vtable_fixup_count, i; + + hr = assembly_from_hmodule(&assembly, hmodule); + if (SUCCEEDED(hr)) + { + hr = assembly_get_vtable_fixups(assembly, &vtable_fixups, &vtable_fixup_count); + if (CAN_FIXUP_VTABLE) + for (i=0; i<vtable_fixup_count; i++) + FixupVTableEntry(hmodule, &vtable_fixups[i]); + else if (vtable_fixup_count) + FIXME("cannot fixup vtable; expect a crash\n"); + + assembly_release(assembly); + } + else + ERR("failed to read CLR headers, hr=%x\n", hr); +} + __int32 WINAPI _CorExeMain(void) { int exit_code; int argc; char **argv; MonoDomain *domain; - MonoAssembly *assembly; + MonoImage *image; + MonoImageOpenStatus status; + MonoAssembly *assembly=NULL; WCHAR filename[MAX_PATH]; char *filenameA; ICLRRuntimeInfo *info; @@ -825,6 +1057,8 @@ if (!filenameA) return -1; + FixupVTable(GetModuleHandleW(NULL)); + hr = get_runtime_info(filename, NULL, NULL, 0, 0, FALSE, &info); if (SUCCEEDED(hr)) @@ -836,9 +1070,21 @@ if (SUCCEEDED(hr)) { - assembly = host->mono->mono_domain_assembly_open(domain, filenameA); - - exit_code = host->mono->mono_jit_exec(domain, assembly, argc, argv); + image = host->mono->mono_image_open_from_module_handle(GetModuleHandleW(NULL), + filenameA, 1, &status); + + if (image) + assembly = host->mono->mono_assembly_load_from(image, filenameA, &status); + + if (assembly) + { + exit_code = host->mono->mono_jit_exec(domain, assembly, argc, argv); + } + else + { + ERR("couldn't load %s, status=%d\n", debugstr_w(filename), status); + exit_code = -1; + } RuntimeHost_DeleteDomain(host, domain); } @@ -855,6 +1101,43 @@ unload_all_runtimes(); return exit_code; +} + +BOOL WINAPI _CorDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + FixupVTable(hinstDLL); + break; + case DLL_PROCESS_DETACH: + /* FIXME: clean up the vtables */ + break; + } + return TRUE; +} + +/* called from DLL_PROCESS_ATTACH */ +void runtimehost_init(void) +{ + dll_fixup_heap = HeapCreate(HEAP_CREATE_ENABLE_EXECUTE, 0, 0); + list_init(&dll_fixups); +} + +/* called from DLL_PROCESS_DETACH */ +void runtimehost_uninit(void) +{ + struct dll_fixup *fixup, *fixup2; + + HeapDestroy(dll_fixup_heap); + LIST_FOR_EACH_ENTRY_SAFE(fixup, fixup2, &dll_fixups, struct dll_fixup, entry) + { + HeapFree(GetProcessHeap(), 0, fixup->tokens); + HeapFree(GetProcessHeap(), 0, fixup); + } } HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, @@ -943,3 +1226,148 @@ HeapFree( GetProcessHeap(), 0, This ); return S_OK; } + +#define CHARS_IN_GUID 39 +#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) + +HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) +{ + static const WCHAR wszCodebase[] = {'C','o','d','e','B','a','s','e',0}; + static const WCHAR wszClass[] = {'C','l','a','s','s',0}; + static const WCHAR wszFileSlash[] = {'f','i','l','e',':','/','/','/',0}; + static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0}; + static const WCHAR wszInprocServer32[] = {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; + WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) + ARRAYSIZE(wszInprocServer32) - 1]; + MonoDomain *domain; + MonoAssembly *assembly; + ICLRRuntimeInfo *info; + RuntimeHost *host; + HRESULT hr; + HKEY key; + LONG res; + int offset = 0; + WCHAR codebase[MAX_PATH + 8]; + WCHAR classname[350]; + WCHAR filename[MAX_PATH]; + + DWORD dwBufLen = 350; + + lstrcpyW(path, wszCLSIDSlash); + StringFromGUID2(riid, path + lstrlenW(wszCLSIDSlash), CHARS_IN_GUID); + lstrcatW(path, wszInprocServer32); + + TRACE("Registry key: %s\n", debugstr_w(path)); + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, path, 0, KEY_READ, &key); + if (res == ERROR_FILE_NOT_FOUND) + return CLASS_E_CLASSNOTAVAILABLE; + + res = RegGetValueW( key, NULL, wszClass, RRF_RT_REG_SZ, NULL, classname, &dwBufLen); + if(res != ERROR_SUCCESS) + { + WARN("Class value cannot be found.\n"); + hr = CLASS_E_CLASSNOTAVAILABLE; + goto cleanup; + } + + TRACE("classname (%s)\n", debugstr_w(classname)); + + dwBufLen = MAX_PATH + 8; + res = RegGetValueW( key, NULL, wszCodebase, RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); + if(res != ERROR_SUCCESS) + { + WARN("CodeBase value cannot be found.\n"); + hr = CLASS_E_CLASSNOTAVAILABLE; + goto cleanup; + } + + /* Strip file:/// */ + if(strncmpW(codebase, wszFileSlash, strlenW(wszFileSlash)) == 0) + offset = strlenW(wszFileSlash); + + strcpyW(filename, codebase + offset); + + TRACE("codebase (%s)\n", debugstr_w(filename)); + + *ppObj = NULL; + + + hr = get_runtime_info(filename, NULL, NULL, 0, 0, FALSE, &info); + if (SUCCEEDED(hr)) + { + hr = ICLRRuntimeInfo_GetRuntimeHost(info, &host); + + if (SUCCEEDED(hr)) + hr = RuntimeHost_GetDefaultDomain(host, &domain); + + if (SUCCEEDED(hr)) + { + MonoImage *image; + MonoClass *klass; + MonoObject *result; + IUnknown *unk = NULL; + char *filenameA, *ns; + char *classA; + + hr = CLASS_E_CLASSNOTAVAILABLE; + + host->mono->mono_thread_attach(domain); + + filenameA = WtoA(filename); + assembly = host->mono->mono_domain_assembly_open(domain, filenameA); + HeapFree(GetProcessHeap(), 0, filenameA); + if (!assembly) + { + ERR("Cannot open assembly %s\n", filenameA); + goto cleanup; + } + + image = host->mono->mono_assembly_get_image(assembly); + if (!image) + { + ERR("Couldn't get assembly image\n"); + goto cleanup; + } + + classA = WtoA(classname); + ns = strrchr(classA, '.'); + *ns = '\0'; + + klass = host->mono->mono_class_from_name(image, classA, ns+1); + HeapFree(GetProcessHeap(), 0, classA); + if (!klass) + { + ERR("Couldn't get class from image\n"); + goto cleanup; + } + + /* + * Use the default constructor for the .NET class. + */ + result = host->mono->mono_object_new(domain, klass); + host->mono->mono_runtime_object_init(result); + + hr = RuntimeHost_GetIUnknownForObject(host, result, &unk); + if (SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, ppObj); + + IUnknown_Release(unk); + } + else + hr = CLASS_E_CLASSNOTAVAILABLE; + } + else + hr = CLASS_E_CLASSNOTAVAILABLE; + } + else + hr = CLASS_E_CLASSNOTAVAILABLE; + +cleanup: + if(info) + ICLRRuntimeInfo_Release(info); + + RegCloseKey(key); + + return hr; +} Modified: trunk/reactos/dll/win32/mscoree/metahost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/metahost… ============================================================================== --- trunk/reactos/dll/win32/mscoree/metahost.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/metahost.c [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -165,16 +165,19 @@ } while (0); LOAD_MONO_FUNCTION(mono_assembly_get_image); + LOAD_MONO_FUNCTION(mono_assembly_load_from); LOAD_MONO_FUNCTION(mono_assembly_open); LOAD_MONO_FUNCTION(mono_config_parse); LOAD_MONO_FUNCTION(mono_class_from_mono_type); LOAD_MONO_FUNCTION(mono_class_from_name); LOAD_MONO_FUNCTION(mono_class_get_method_from_name); LOAD_MONO_FUNCTION(mono_domain_assembly_open); + LOAD_MONO_FUNCTION(mono_image_open_from_module_handle); LOAD_MONO_FUNCTION(mono_install_assembly_preload_hook); LOAD_MONO_FUNCTION(mono_jit_exec); LOAD_MONO_FUNCTION(mono_jit_init); LOAD_MONO_FUNCTION(mono_jit_set_trace_options); + LOAD_MONO_FUNCTION(mono_marshal_get_vtfixup_ftnptr); LOAD_MONO_FUNCTION(mono_object_get_domain); LOAD_MONO_FUNCTION(mono_object_new); LOAD_MONO_FUNCTION(mono_object_unbox); @@ -186,6 +189,7 @@ LOAD_MONO_FUNCTION(mono_set_dirs); LOAD_MONO_FUNCTION(mono_stringify_assembly_name); LOAD_MONO_FUNCTION(mono_string_new); + LOAD_MONO_FUNCTION(mono_thread_attach); /* GLib imports obsoleted by the 2.0 ABI */ if (This->mono_abi_version == 1) @@ -564,6 +568,14 @@ return CLRRuntimeInfo_GetRuntimeHost(This, result); } +#ifdef __i386__ +static const WCHAR libmono2_arch_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','-','2','.','0','-','x','8','6','.','d','l','l',0}; +#elif defined(__x86_64__) +static const WCHAR libmono2_arch_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','-','2','.','0','-','x','8','6','_','6','4','.','d','l','l',0}; +#else +static const WCHAR libmono2_arch_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','-','2','.','0','.','d','l','l',0}; +#endif + static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int abi_version) { static const WCHAR mono_dll[] = {'\\','b','i','n','\\','m','o','n','o','.','d','l','l',0}; @@ -588,8 +600,15 @@ else if (abi_version == 2) { strcpyW(dll_path, path); - strcatW(dll_path, mono2_dll); + strcatW(dll_path, libmono2_arch_dll); attributes = GetFileAttributesW(dll_path); + + if (attributes == INVALID_FILE_ATTRIBUTES) + { + strcpyW(dll_path, path); + strcatW(dll_path, mono2_dll); + attributes = GetFileAttributesW(dll_path); + } if (attributes == INVALID_FILE_ATTRIBUTES) { @@ -973,7 +992,7 @@ *minor = 0; *build = 0; - if (version[0] == 'v') + if (version[0] == 'v' || version[0] == 'V') { version++; if (!isdigit(*version)) @@ -1310,11 +1329,21 @@ if (version) { - return CLRMetaHost_GetRuntime(0, version, &IID_ICLRRuntimeInfo, (void**)result); + hr = CLRMetaHost_GetRuntime(0, version, &IID_ICLRRuntimeInfo, (void**)result); + if(SUCCEEDED(hr)) + return hr; } if (runtimeinfo_flags & RUNTIME_INFO_UPGRADE_VERSION) { + DWORD major, minor, build; + + if (version && !parse_runtime_version(version, &major, &minor, &build)) + { + ERR("Cannot parse %s\n", debugstr_w(version)); + return CLR_E_SHIM_RUNTIME; + } + find_runtimes(); if (legacy) @@ -1325,8 +1354,16 @@ while (i--) { if (runtimes[i].mono_abi_version) - return ICLRRuntimeInfo_QueryInterface(&runtimes[i].ICLRRuntimeInfo_iface, - &IID_ICLRRuntimeInfo, (void **)result); + { + /* Must be greater or equal to the version passed in. */ + if (!version || ((runtimes[i].major >= major && runtimes[i].minor >= minor && runtimes[i].build >= build) || + (runtimes[i].major >= major && runtimes[i].minor > minor) || + (runtimes[i].major > major))) + { + return ICLRRuntimeInfo_QueryInterface(&runtimes[i].ICLRRuntimeInfo_iface, + &IID_ICLRRuntimeInfo, (void **)result); + } + } } if (legacy) Modified: trunk/reactos/dll/win32/mscoree/mscoree.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree.… ============================================================================== --- trunk/reactos/dll/win32/mscoree/mscoree.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/mscoree.spec [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -9,7 +9,7 @@ @ stub CloseCtrs @ stdcall CLRCreateInstance(ptr ptr ptr) @ stdcall ClrCreateManagedInstance(wstr ptr ptr) -@ stub CoEEShutDownCOM +@ stdcall CoEEShutDownCOM() @ stdcall CoInitializeCor(long) @ stub CoInitializeEE @ stub CoUninitializeCor Modified: trunk/reactos/dll/win32/mscoree/mscoree_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree_… ============================================================================== --- trunk/reactos/dll/win32/mscoree/mscoree_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/mscoree_main.c [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -52,6 +52,8 @@ static HINSTANCE MSCOREE_hInstance; +typedef HRESULT (*fnCreateInstance)(REFIID riid, LPVOID *ppObj); + char *WtoA(LPCWSTR wstr) { int length; @@ -88,6 +90,105 @@ return TRUE; } + +typedef struct mscorecf +{ + IClassFactory IClassFactory_iface; + LONG ref; + + fnCreateInstance pfnCreateInstance; + + CLSID clsid; +} mscorecf; + +static inline mscorecf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return CONTAINING_RECORD(iface, mscorecf, IClassFactory_iface); +} + +static HRESULT WINAPI mscorecf_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppobj ) +{ + TRACE("%s %p\n", debugstr_guid(riid), ppobj); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef( iface ); + *ppobj = iface; + return S_OK; + } + + ERR("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI mscorecf_AddRef(IClassFactory *iface ) +{ + mscorecf *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("%p ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mscorecf_Release(IClassFactory *iface ) +{ + mscorecf *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("%p ref=%u\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mscorecf_CreateInstance(IClassFactory *iface,LPUNKNOWN pOuter, + REFIID riid, LPVOID *ppobj ) +{ + mscorecf *This = impl_from_IClassFactory( iface ); + HRESULT hr; + IUnknown *punk; + + TRACE("%p %s %p\n", pOuter, debugstr_guid(riid), ppobj ); + + *ppobj = NULL; + + if (pOuter) + return CLASS_E_NOAGGREGATION; + + hr = This->pfnCreateInstance( &This->clsid, (LPVOID*) &punk ); + if (SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface( punk, riid, ppobj ); + + IUnknown_Release( punk ); + } + else + { + WARN("Cannot create an instance object. 0x%08x\n", hr); + } + return hr; +} + +static HRESULT WINAPI mscorecf_LockServer(IClassFactory *iface, BOOL dolock) +{ + FIXME("(%p)->(%d),stub!\n",iface,dolock); + return S_OK; +} + +static const struct IClassFactoryVtbl mscorecf_vtbl = +{ + mscorecf_QueryInterface, + mscorecf_AddRef, + mscorecf_Release, + mscorecf_CreateInstance, + mscorecf_LockServer +}; HRESULT WINAPI CorBindToRuntimeHost(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor, LPCWSTR pwszHostConfigFile, VOID *pReserved, @@ -126,25 +227,13 @@ case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + runtimehost_init(); DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: expect_no_runtimes(); - break; - } - return TRUE; -} - -BOOL WINAPI _CorDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - FIXME("(%p, %d, %p): stub\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: + if (lpvReserved) break; /* process is terminating */ + runtimehost_uninit(); break; } return TRUE; @@ -246,6 +335,9 @@ if (SUCCEEDED(ret)) { + if(pwszVersion) + pVersion[0] = pwszVersion[0]; + *dwDirectoryLength = dwDirectory; ret = ICLRRuntimeInfo_GetRuntimeDirectory(info, pDirectory, dwDirectoryLength); } @@ -258,7 +350,7 @@ HRESULT WINAPI GetRequestedRuntimeVersion(LPWSTR pExe, LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength) { - TRACE("(%s, %p, %d, %p)\n", debugstr_w(pExe), debugstr_w(pExe), cchBuffer, dwlength); + TRACE("(%s, %p, %d, %p)\n", debugstr_w(pExe), pVersion, cchBuffer, dwlength); if(!dwlength) return E_POINTER; @@ -504,11 +596,25 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) { - FIXME("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + mscorecf *This; + HRESULT hr; + + TRACE("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + if(!ppv) return E_INVALIDARG; - return E_NOTIMPL; + This = HeapAlloc(GetProcessHeap(), 0, sizeof(mscorecf)); + + This->IClassFactory_iface.lpVtbl = &mscorecf_vtbl; + This->pfnCreateInstance = &create_monodata; + This->ref = 1; + This->clsid = *rclsid; + + hr = IClassFactory_QueryInterface( &This->IClassFactory_iface, riid, ppv ); + IClassFactory_Release(&This->IClassFactory_iface); + + return hr; } HRESULT WINAPI DllRegisterServer(void) @@ -526,6 +632,11 @@ return S_FALSE; } +void WINAPI CoEEShutDownCOM(void) +{ + FIXME("stub.\n"); +} + INT WINAPI ND_RU1( const void *ptr, INT offset ) { return *((const BYTE *)ptr + offset); Modified: trunk/reactos/dll/win32/mscoree/mscoree_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree_… ============================================================================== --- trunk/reactos/dll/win32/mscoree/mscoree_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscoree/mscoree_private.h [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -27,11 +27,19 @@ extern HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, LPCWSTR pwzFilePath, LPWSTR pwzBuffer, DWORD *pcchBuffer) DECLSPEC_HIDDEN; +typedef struct _VTableFixup { + DWORD rva; + WORD count; + WORD type; +} VTableFixup; + typedef struct tagASSEMBLY ASSEMBLY; -HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) DECLSPEC_HIDDEN; -HRESULT assembly_release(ASSEMBLY *assembly) DECLSPEC_HIDDEN; -HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN; +extern HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) DECLSPEC_HIDDEN; +extern HRESULT assembly_from_hmodule(ASSEMBLY **out, HMODULE hmodule) DECLSPEC_HIDDEN; +extern HRESULT assembly_release(ASSEMBLY *assembly) DECLSPEC_HIDDEN; +extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN; +extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; /* Mono embedding */ typedef struct _MonoDomain MonoDomain; @@ -44,6 +52,7 @@ typedef struct _MonoString MonoString; typedef struct _MonoMethod MonoMethod; typedef struct _MonoProfiler MonoProfiler; +typedef struct _MonoThread MonoThread; typedef struct loaded_mono loaded_mono; typedef struct RuntimeHost RuntimeHost; @@ -137,6 +146,7 @@ BOOL is_shutdown; MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly); + MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status); MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name); @@ -144,10 +154,12 @@ void (CDECL *mono_config_parse)(const char *filename); MonoAssembly* (CDECL *mono_domain_assembly_open) (MonoDomain *domain, const char *name); void (CDECL *mono_free)(void *); + MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status); void (CDECL *mono_install_assembly_preload_hook)(MonoAssemblyPreLoadFunc func, void *user_data); int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); MonoDomain* (CDECL *mono_jit_init)(const char *file); int (CDECL *mono_jit_set_trace_options)(const char* options); + void* (CDECL *mono_marshal_get_vtfixup_ftnptr)(MonoImage *image, DWORD token, WORD type); MonoDomain* (CDECL *mono_object_get_domain)(MonoObject *obj); MonoObject* (CDECL *mono_object_new)(MonoDomain *domain, MonoClass *klass); void* (CDECL *mono_object_unbox)(MonoObject *obj); @@ -163,6 +175,7 @@ void (CDECL *mono_thread_suspend_all_other_threads)(void); void (CDECL *mono_threads_set_shutting_down)(void); MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); + MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); }; /* loaded runtime interfaces */ @@ -186,4 +199,9 @@ extern HRESULT CorDebug_Create(ICLRRuntimeHost *runtimehost, IUnknown** ppUnk) DECLSPEC_HIDDEN; +extern HRESULT create_monodata(REFIID riid, LPVOID *ppObj) DECLSPEC_HIDDEN; + +extern void runtimehost_init(void); +extern void runtimehost_uninit(void); + #endif /* __MSCOREE_PRIVATE__ */ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Jun 4 10:46:54 2012 @@ -95,7 +95,7 @@ reactos/dll/win32/msadp32.acm # Synced to Wine-1.3.37 reactos/dll/win32/mscat32 # Synced to Wine-1.3.37 reactos/dll/win32/mscms # Synced to Wine-1.5.4 -reactos/dll/win32/mscoree # Synced to Wine-1.3.37 +reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to Wine-1.3.37 reactos/dll/win32/msftedit # Synced to Wine-1.3.37 reactos/dll/win32/msg711.acm # Synced to Wine-1.3.37

12 years, 6 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2012