Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 57031: [KERNEL32] - Sync FormatMessage implementation to Wine 1.5.4. Fixes crash in kernel32_winetest:format_msg. See issue #7217 for more details.
by tfaber＠svn.reactos.org 03 Aug '12

03 Aug '12

Author: tfaber Date: Fri Aug 3 06:38:44 2012 New Revision: 57031 URL: http://svn.reactos.org/svn/reactos?rev=57031&view=rev Log: [KERNEL32] - Sync FormatMessage implementation to Wine 1.5.4. Fixes crash in kernel32_winetest:format_msg. See issue #7217 for more details. Modified: trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c [iso-8859-1] Fri Aug 3 06:38:44 2012 @@ -70,7 +70,6 @@ * Yes, ANSI strings in win32 resources. Go figure. */ -static const WCHAR PCNTFMTWSTR[] = { '%','%','%','s',0 }; static const WCHAR FMTWSTR[] = { '%','s',0 }; /********************************************************************** @@ -138,15 +137,18 @@ if (*format != '!') /* simple string */ { arg = get_arg( insert, flags, args ); - if (unicode_caller) - { - WCHAR *str = (WCHAR *)arg; + if (unicode_caller || !arg) + { + static const WCHAR nullW[] = {'(','n','u','l','l',')',0}; + const WCHAR *str = (const WCHAR *)arg; + + if (!str) str = nullW; *result = HeapAlloc( GetProcessHeap(), 0, (strlenW(str) + 1) * sizeof(WCHAR) ); strcpyW( *result, str ); } else { - char *str = (char *)arg; + const char *str = (const char *)arg; DWORD length = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); *result = HeapAlloc( GetProcessHeap(), 0, length * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, str, -1, *result, length ); 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] Fri Aug 3 06:38:44 2012 @@ -233,10 +233,19 @@ reactos/dll/win32/gdi32/objects/linedda.c # Synced at 20090410 kernel32 - - reactos/dll/win32/kernel32/misc/errormsg.c # Out of sync - reactos/dll/win32/kernel32/misc/profile.c # Out of sync - reactos/dll/win32/kernel32/misc/lcformat.c # Synced to Wine-1_3 - reactos/dll/win32/kernel32/misc/lzexpand.c # Synced to Wine-1_1_23 + reactos/dll/win32/kernel32/wine/actctx.c # Partly synced + reactos/dll/win32/kernel32/wine/comm.c # Synced in r52754 + reactos/dll/win32/kernel32/wine/lzexpand.c # Synced in r52754 + reactos/dll/win32/kernel32/wine/profile.c # Synced in r52754 + reactos/dll/win32/kernel32/wine/res.c # Synced in r52754 + reactos/dll/win32/kernel32/winnls/string/casemap.c # Synced in r52754 + reactos/dll/win32/kernel32/winnls/string/chartype.c # Synced in r52754 + reactos/dll/win32/kernel32/winnls/string/collation.c # Synced in r52754 + reactos/dll/win32/kernel32/winnls/string/format_msg.c # Synced to Wine-1.5.4 + reactos/dll/win32/kernel32/winnls/string/lang.c # Synced in r52754 + reactos/dll/win32/kernel32/winnls/string/lcformat.c # Synced in r52754 + reactos/dll/win32/kernel32/winnls/string/nls.c # Synced in r52754 + reactos/dll/win32/kernel32/winnls/string/sortkey.c # Synced in r52754 msvcrt - reactos/lib/sdk/crt/except/cpp.c # Synced at 20080528

1 0

[fireball] 57030: [NTOS/MM] - Implement ProtectionMask validation in MiFlushTbAndCapture for cached and non-cached PFNs.
by fireball＠svn.reactos.org 02 Aug '12

02 Aug '12

Author: fireball Date: Thu Aug 2 22:34:51 2012 New Revision: 57030 URL: http://svn.reactos.org/svn/reactos?rev=57030&view=rev Log: [NTOS/MM] - Implement ProtectionMask validation in MiFlushTbAndCapture for cached and non-cached PFNs. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Thu Aug 2 22:34:51 2012 @@ -1602,6 +1602,7 @@ { MMPTE TempPte, PreviousPte; KIRQL OldIrql; + BOOLEAN RebuildPte = FALSE; // // User for sanity checking later on @@ -1618,11 +1619,45 @@ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); // - // We don't support I/O mappings in this path yet, and only cached memory + // We don't support I/O mappings in this path yet // ASSERT(Pfn1 != NULL); - ASSERT(Pfn1->u3.e1.CacheAttribute == MiCached); - ASSERT((ProtectionMask & (MM_NOCACHE | MM_NOACCESS)) == 0); + ASSERT(Pfn1->u3.e1.CacheAttribute != MiWriteCombined); + + // + // Make sure new protection mask doesn't get in conflict and fix it if it does + // + if (Pfn1->u3.e1.CacheAttribute == MiCached) + { + // + // This is a cached PFN + // + if (ProtectionMask & (MM_NOCACHE | MM_NOACCESS)) + { + RebuildPte = TRUE; + ProtectionMask &= ~(MM_NOCACHE | MM_NOACCESS); + } + } + else if (Pfn1->u3.e1.CacheAttribute == MiNonCached) + { + // + // This is a non-cached PFN + // + if ((ProtectionMask & (MM_NOCACHE | MM_NOACCESS)) != MM_NOCACHE) + { + RebuildPte = TRUE; + ProtectionMask &= ~MM_NOACCESS; + ProtectionMask |= MM_NOCACHE; + } + } + + if (RebuildPte) + { + MI_MAKE_HARDWARE_PTE_USER(&TempPte, + PointerPte, + ProtectionMask, + PreviousPte.u.Hard.PageFrameNumber); + } // // Write the new PTE, making sure we are only changing the bits

1 0

[ekohl] 57029: [SAMLIB/SAMSRV] - Implement SamEnumerateGroupsInDomain and SamEnumerateUsersInDomain (ignore UserAccountControl). - Simplify SamrEnumerateAliasesInDomain.
by ekohl＠svn.reactos.org 02 Aug '12

02 Aug '12

Author: ekohl Date: Thu Aug 2 20:09:24 2012 New Revision: 57029 URL: http://svn.reactos.org/svn/reactos?rev=57029&view=rev Log: [SAMLIB/SAMSRV] - Implement SamEnumerateGroupsInDomain and SamEnumerateUsersInDomain (ignore UserAccountControl). - Simplify SamrEnumerateAliasesInDomain. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/samrpc.c 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 Aug 2 20:09:24 2012 @@ -159,7 +159,7 @@ { NTSTATUS Status; - TRACE("SamConnect(%p,%p,0x%08x,%p)\n", + TRACE("SamConnect(%p %p 0x%08x %p)\n", ServerName, ServerHandle, DesiredAccess, ObjectAttributes); RpcTryExcept @@ -188,7 +188,7 @@ { NTSTATUS Status; - TRACE("SamCreateAliasInDomain(%p,%p,0x%08x,%p,%p)\n", + TRACE("SamCreateAliasInDomain(%p %p 0x%08x %p %p)\n", DomainHandle, AccountName, DesiredAccess, AliasHandle, RelativeId); RpcTryExcept @@ -219,7 +219,7 @@ { NTSTATUS Status; - TRACE("SamCreateGroupInDomain(%p,%p,0x%08x,%p,%p)\n", + TRACE("SamCreateGroupInDomain(%p %p 0x%08x %p %p)\n", DomainHandle, AccountName, DesiredAccess, GroupHandle, RelativeId); RpcTryExcept @@ -250,7 +250,7 @@ { NTSTATUS Status; - TRACE("SamCreateUserInDomain(%p,%p,0x%08x,%p,%p)\n", + TRACE("SamCreateUserInDomain(%p %p 0x%08x %p %p)\n", DomainHandle, AccountName, DesiredAccess, UserHandle, RelativeId); RpcTryExcept @@ -282,7 +282,7 @@ PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; NTSTATUS Status; - TRACE("SamEnumerateAliasesInDomain(%p,%p,%p,%lu,%p)\n", + TRACE("SamEnumerateAliasesInDomain(%p %p %p %lu %p)\n", DomainHandle, EnumerationContext, Buffer, PreferedMaximumLength, CountReturned); @@ -332,7 +332,7 @@ PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; NTSTATUS Status; - TRACE("SamEnumerateDomainsInSamServer(%p,%p,%p,%lu,%p)\n", + TRACE("SamEnumerateDomainsInSamServer(%p %p %p %lu %p)\n", ServerHandle, EnumerationContext, Buffer, PreferedMaximumLength, CountReturned); @@ -360,6 +360,101 @@ midl_user_free(EnumBuffer); } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI +SamEnumerateGroupsInDomain(IN SAM_HANDLE DomainHandle, + IN OUT PSAM_ENUMERATE_HANDLE EnumerationContext, + IN PVOID *Buffer, + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned) +{ + PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; + NTSTATUS Status; + + TRACE("SamEnumerateGroupsInDomain(%p %p %p %lu %p)\n", + DomainHandle, EnumerationContext, Buffer, + PreferedMaximumLength, CountReturned); + + if (EnumerationContext == NULL || Buffer == NULL || CountReturned == NULL) + return STATUS_INVALID_PARAMETER; + + *Buffer = NULL; + + RpcTryExcept + { + Status = SamrEnumerateGroupsInDomain((SAMPR_HANDLE)DomainHandle, + EnumerationContext, + (PSAMPR_ENUMERATION_BUFFER *)&EnumBuffer, + PreferedMaximumLength, + CountReturned); + if (EnumBuffer != NULL) + { + if (EnumBuffer->Buffer != NULL) + *Buffer = EnumBuffer->Buffer; + + midl_user_free(EnumBuffer); + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI +SamEnumerateUsersInDomain(IN SAM_HANDLE DomainHandle, + IN OUT PSAM_ENUMERATE_HANDLE EnumerationContext, + IN ULONG UserAccountControl, + OUT PVOID *Buffer, + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned) +{ + PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; + NTSTATUS Status; + + TRACE("SamEnumerateUsersInDomain(%p %p %lx %p %lu %p)\n", + DomainHandle, EnumerationContext, UserAccountControl, Buffer, + PreferedMaximumLength, CountReturned); + + if (EnumerationContext == NULL || Buffer == NULL || CountReturned == NULL) + return STATUS_INVALID_PARAMETER; + + *Buffer = NULL; + + RpcTryExcept + { + Status = SamrEnumerateUsersInDomain((SAMPR_HANDLE)DomainHandle, + EnumerationContext, + UserAccountControl, + (PSAMPR_ENUMERATION_BUFFER *)&EnumBuffer, + PreferedMaximumLength, + CountReturned); + if (EnumBuffer != NULL) + { + if (EnumBuffer->Buffer != NULL) + { + *Buffer = EnumBuffer->Buffer; + } + + midl_user_free(EnumBuffer); + } + } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { @@ -483,7 +578,7 @@ { NTSTATUS Status; - TRACE("SamLookupDomainInSamServer(%p,%p,%p)\n", + TRACE("SamLookupDomainInSamServer(%p %p %p)\n", ServerHandle, Name, DomainId); RpcTryExcept @@ -553,7 +648,7 @@ { NTSTATUS Status; - TRACE("SamOpenDomain(%p,0x%08x,%p,%p)\n", + TRACE("SamOpenDomain(%p 0x%08x %p %p)\n", ServerHandle, DesiredAccess, DomainId, DomainHandle); RpcTryExcept @@ -582,7 +677,7 @@ { NTSTATUS Status; - TRACE("SamOpenGroup(%p,0x%08x,%p,%p)\n", + TRACE("SamOpenGroup(%p 0x%08x %p %p)\n", DomainHandle, DesiredAccess, GroupId, GroupHandle); RpcTryExcept @@ -611,7 +706,7 @@ { NTSTATUS Status; - TRACE("SamOpenUser(%p,0x%08x,%lx,%p)\n", + TRACE("SamOpenUser(%p 0x%08x %lx %p)\n", DomainHandle, DesiredAccess, UserId, UserHandle); RpcTryExcept @@ -770,18 +865,18 @@ NTAPI SamSetInformationDomain(IN SAM_HANDLE DomainHandle, IN DOMAIN_INFORMATION_CLASS DomainInformationClass, - IN PVOID DomainInformation) + IN PVOID Buffer) { NTSTATUS Status; TRACE("SamSetInformationDomain(%p %lu %p)\n", - DomainHandle, DomainInformationClass, DomainInformation); + DomainHandle, DomainInformationClass, Buffer); RpcTryExcept { Status = SamrSetInformationDomain((SAMPR_HANDLE)DomainHandle, DomainInformationClass, - DomainInformation); + Buffer); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { 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 Aug 2 20:09:24 2012 @@ -16,8 +16,8 @@ @ stub SamDeleteUser @ stdcall SamEnumerateAliasesInDomain(ptr ptr ptr long ptr) @ stdcall SamEnumerateDomainsInSamServer(ptr ptr ptr long ptr) -@ stub SamEnumerateGroupsInDomain -@ stub SamEnumerateUsersInDomain +@ stdcall SamEnumerateGroupsInDomain(ptr ptr ptr long ptr) +@ stdcall SamEnumerateUsersInDomain(ptr ptr long ptr long ptr) @ stdcall SamFreeMemory(ptr) @ stdcall SamGetAliasMembership(ptr long ptr ptr ptr) @ stub SamGetCompatibilityMode 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 Aug 2 20:09:24 2012 @@ -1696,8 +1696,197 @@ IN unsigned long PreferedMaximumLength, OUT unsigned long *CountReturned) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; + PSAM_DB_OBJECT DomainObject; + HANDLE GroupsKeyHandle = NULL; + HANDLE NamesKeyHandle = NULL; + WCHAR GroupName[64]; + ULONG EnumIndex; + ULONG EnumCount = 0; + ULONG RequiredLength = 0; + ULONG NameLength; + ULONG DataLength; + ULONG Rid; + ULONG i; + BOOLEAN MoreEntries = FALSE; + NTSTATUS Status; + + TRACE("SamrEnumerateUsersInDomain(%p %p %p %lu %p)\n", + DomainHandle, EnumerationContext, Buffer, + PreferedMaximumLength, CountReturned); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_LIST_ACCOUNTS, + &DomainObject); + if (!NT_SUCCESS(Status)) + return Status; + + Status = SampRegOpenKey(DomainObject->KeyHandle, + L"Groups", + KEY_READ, + &GroupsKeyHandle); + if (!NT_SUCCESS(Status)) + return Status; + + Status = SampRegOpenKey(GroupsKeyHandle, + L"Names", + KEY_READ, + &NamesKeyHandle); + if (!NT_SUCCESS(Status)) + goto done; + + TRACE("Part 1\n"); + + EnumIndex = *EnumerationContext; + + while (TRUE) + { + NameLength = 64 * sizeof(WCHAR); + Status = SampRegEnumerateValue(NamesKeyHandle, + EnumIndex, + GroupName, + &NameLength, + NULL, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_SUCCESS; + break; + } + + TRACE("EnumIndex: %lu\n", EnumIndex); + TRACE("Group name: %S\n", GroupName); + TRACE("Name length: %lu\n", NameLength); + + if ((RequiredLength + NameLength + sizeof(UNICODE_NULL) + sizeof(SAMPR_RID_ENUMERATION)) > PreferedMaximumLength) + { + MoreEntries = TRUE; + break; + } + + RequiredLength += (NameLength + sizeof(UNICODE_NULL) + sizeof(SAMPR_RID_ENUMERATION)); + EnumCount++; + + EnumIndex++; + } + + TRACE("EnumCount: %lu\n", EnumCount); + TRACE("RequiredLength: %lu\n", RequiredLength); + + if (!NT_SUCCESS(Status)) + goto done; + + EnumBuffer = midl_user_allocate(sizeof(SAMPR_ENUMERATION_BUFFER)); + if (EnumBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + EnumBuffer->EntriesRead = EnumCount; + if (EnumCount == 0) + goto done; + + EnumBuffer->Buffer = midl_user_allocate(EnumCount * sizeof(SAMPR_RID_ENUMERATION)); + if (EnumBuffer->Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + TRACE("Part 2\n"); + + EnumIndex = *EnumerationContext; + for (i = 0; i < EnumCount; i++, EnumIndex++) + { + NameLength = 64 * sizeof(WCHAR); + DataLength = sizeof(ULONG); + Status = SampRegEnumerateValue(NamesKeyHandle, + EnumIndex, + GroupName, + &NameLength, + NULL, + &Rid, + &DataLength); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_SUCCESS; + break; + } + + TRACE("EnumIndex: %lu\n", EnumIndex); + TRACE("Group name: %S\n", GroupName); + TRACE("Name length: %lu\n", NameLength); + TRACE("RID: %lu\n", Rid); + + EnumBuffer->Buffer[i].RelativeId = Rid; + + EnumBuffer->Buffer[i].Name.Length = (USHORT)NameLength; + EnumBuffer->Buffer[i].Name.MaximumLength = (USHORT)(DataLength + sizeof(UNICODE_NULL)); + +/* FIXME: Disabled because of bugs in widl and rpcrt4 */ +#if 0 + EnumBuffer->Buffer[i].Name.Buffer = midl_user_allocate(EnumBuffer->Buffer[i].Name.MaximumLength); + if (EnumBuffer->Buffer[i].Name.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + memcpy(EnumBuffer->Buffer[i].Name.Buffer, + GroupName, + EnumBuffer->Buffer[i].Name.Length); +#endif + } + +done: + if (NT_SUCCESS(Status)) + { + *EnumerationContext += EnumCount; + *Buffer = EnumBuffer; + *CountReturned = EnumCount; + } + else + { + *EnumerationContext = 0; + *Buffer = NULL; + *CountReturned = 0; + + if (EnumBuffer != NULL) + { + if (EnumBuffer->Buffer != NULL) + { + if (EnumBuffer->EntriesRead != 0) + { + for (i = 0; i < EnumBuffer->EntriesRead; i++) + { + if (EnumBuffer->Buffer[i].Name.Buffer != NULL) + midl_user_free(EnumBuffer->Buffer[i].Name.Buffer); + } + } + + midl_user_free(EnumBuffer->Buffer); + } + + midl_user_free(EnumBuffer); + } + } + + if (NamesKeyHandle != NULL) + SampRegCloseKey(NamesKeyHandle); + + if (GroupsKeyHandle != NULL) + SampRegCloseKey(GroupsKeyHandle); + + if ((Status == STATUS_SUCCESS) && (MoreEntries == TRUE)) + Status = STATUS_MORE_ENTRIES; + + return Status; } @@ -1968,171 +2157,24 @@ IN unsigned long PreferedMaximumLength, OUT unsigned long *CountReturned) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 14 */ -NTSTATUS -NTAPI -SamrCreateAliasInDomain(IN SAMPR_HANDLE DomainHandle, - IN PRPC_UNICODE_STRING AccountName, - IN ACCESS_MASK DesiredAccess, - OUT SAMPR_HANDLE *AliasHandle, - OUT unsigned long *RelativeId) -{ - SAM_DOMAIN_FIXED_DATA FixedDomainData; - PSAM_DB_OBJECT DomainObject; - PSAM_DB_OBJECT AliasObject; - UNICODE_STRING EmptyString = RTL_CONSTANT_STRING(L""); - ULONG ulSize; - ULONG ulRid; - WCHAR szRid[9]; - NTSTATUS Status; - - TRACE("SamrCreateAliasInDomain(%p %p %lx %p %p)\n", - DomainHandle, AccountName, DesiredAccess, AliasHandle, RelativeId); - - /* Validate the domain handle */ - Status = SampValidateDbObject(DomainHandle, - SamDbDomainObject, - DOMAIN_CREATE_ALIAS, - &DomainObject); - if (!NT_SUCCESS(Status)) - { - TRACE("failed with status 0x%08lx\n", Status); - return Status; - } - - /* Check if the alias name already exists in the domain */ - Status = SampCheckAccountNameInDomain(DomainObject, - AccountName->Buffer); - if (!NT_SUCCESS(Status)) - { - TRACE("Alias name \'%S\' already exists in domain (Status 0x%08lx)\n", - AccountName->Buffer, Status); - return Status; - } - - /* Get the fixed domain attributes */ - ulSize = sizeof(SAM_DOMAIN_FIXED_DATA); - Status = SampGetObjectAttribute(DomainObject, - L"F", - NULL, - (PVOID)&FixedDomainData, - &ulSize); - if (!NT_SUCCESS(Status)) - { - TRACE("failed with status 0x%08lx\n", Status); - return Status; - } - - /* Increment the NextRid attribute */ - ulRid = FixedDomainData.NextRid; - FixedDomainData.NextRid++; - - /* Store the fixed domain attributes */ - Status = SampSetObjectAttribute(DomainObject, - L"F", - REG_BINARY, - &FixedDomainData, - ulSize); - if (!NT_SUCCESS(Status)) - { - TRACE("failed with status 0x%08lx\n", Status); - return Status; - } - - TRACE("RID: %lx\n", ulRid); - - /* Convert the RID into a string (hex) */ - swprintf(szRid, L"%08lX", ulRid); - - /* Create the alias object */ - Status = SampCreateDbObject(DomainObject, - L"Aliases", - szRid, - SamDbAliasObject, - DesiredAccess, - &AliasObject); - if (!NT_SUCCESS(Status)) - { - TRACE("failed with status 0x%08lx\n", Status); - return Status; - } - - /* Add the account name for the alias object */ - Status = SampSetAccountNameInDomain(DomainObject, - L"Aliases", - AccountName->Buffer, - ulRid); - if (!NT_SUCCESS(Status)) - { - TRACE("failed with status 0x%08lx\n", Status); - return Status; - } - - /* Set the Name attribute */ - Status = SampSetObjectAttribute(AliasObject, - L"Name", - REG_SZ, - (LPVOID)AccountName->Buffer, - AccountName->MaximumLength); - if (!NT_SUCCESS(Status)) - { - TRACE("failed with status 0x%08lx\n", Status); - return Status; - } - - /* Set the Description attribute */ - Status = SampSetObjectAttribute(AliasObject, - L"Description", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); - if (!NT_SUCCESS(Status)) - { - TRACE("failed with status 0x%08lx\n", Status); - return Status; - } - - if (NT_SUCCESS(Status)) - { - *AliasHandle = (SAMPR_HANDLE)AliasObject; - *RelativeId = ulRid; - } - - TRACE("returns with status 0x%08lx\n", Status); - - return Status; -} - -/* Function 15 */ -NTSTATUS -NTAPI -SamrEnumerateAliasesInDomain(IN SAMPR_HANDLE DomainHandle, - IN OUT unsigned long *EnumerationContext, - OUT PSAMPR_ENUMERATION_BUFFER *Buffer, - IN unsigned long PreferedMaximumLength, - OUT unsigned long *CountReturned) -{ PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; PSAM_DB_OBJECT DomainObject; - HANDLE AliasesKeyHandle; - WCHAR AliasKeyName[64]; - HANDLE AliasKeyHandle; + HANDLE UsersKeyHandle = NULL; + HANDLE NamesKeyHandle = NULL; + WCHAR UserName[64]; ULONG EnumIndex; - ULONG EnumCount; - ULONG RequiredLength; + ULONG EnumCount = 0; + ULONG RequiredLength = 0; + ULONG NameLength; ULONG DataLength; + ULONG Rid; ULONG i; BOOLEAN MoreEntries = FALSE; NTSTATUS Status; - TRACE("SamrEnumerateAliasesInDomain(%p %p %p %lu %p)\n", - DomainHandle, EnumerationContext, Buffer, PreferedMaximumLength, - CountReturned); + TRACE("SamrEnumerateUsersInDomain(%p %p %lx %p %lu %p)\n", + DomainHandle, EnumerationContext, UserAccountControl, Buffer, + PreferedMaximumLength, CountReturned); /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, @@ -2143,24 +2185,33 @@ return Status; Status = SampRegOpenKey(DomainObject->KeyHandle, - L"Aliases", + L"Users", KEY_READ, - &AliasesKeyHandle); - if (!NT_SUCCESS(Status)) - return Status; + &UsersKeyHandle); + if (!NT_SUCCESS(Status)) + return Status; + + Status = SampRegOpenKey(UsersKeyHandle, + L"Names", + KEY_READ, + &NamesKeyHandle); + if (!NT_SUCCESS(Status)) + goto done; TRACE("Part 1\n"); EnumIndex = *EnumerationContext; - EnumCount = 0; - RequiredLength = 0; while (TRUE) { - Status = SampRegEnumerateSubKey(AliasesKeyHandle, - EnumIndex, - 64 * sizeof(WCHAR), - AliasKeyName); + NameLength = 64 * sizeof(WCHAR); + Status = SampRegEnumerateValue(NamesKeyHandle, + EnumIndex, + UserName, + &NameLength, + NULL, + NULL, + NULL); if (!NT_SUCCESS(Status)) { if (Status == STATUS_NO_MORE_ENTRIES) @@ -2169,40 +2220,17 @@ } TRACE("EnumIndex: %lu\n", EnumIndex); - TRACE("Alias key name: %S\n", AliasKeyName); - - Status = SampRegOpenKey(AliasesKeyHandle, - AliasKeyName, - KEY_READ, - &AliasKeyHandle); - TRACE("SampRegOpenKey returned %08lX\n", Status); - if (NT_SUCCESS(Status)) - { - DataLength = 0; - Status = SampRegQueryValue(AliasKeyHandle, - L"Name", - NULL, - NULL, - &DataLength); - - NtClose(AliasKeyHandle); - - TRACE("SampRegQueryValue returned %08lX\n", Status); - - if (NT_SUCCESS(Status)) - { - TRACE("Data length: %lu\n", DataLength); - - if ((RequiredLength + DataLength + sizeof(SAMPR_RID_ENUMERATION)) > PreferedMaximumLength) - { - MoreEntries = TRUE; - break; - } - - RequiredLength += (DataLength + sizeof(SAMPR_RID_ENUMERATION)); - EnumCount++; - } - } + TRACE("User name: %S\n", UserName); + TRACE("Name length: %lu\n", NameLength); + + if ((RequiredLength + NameLength + sizeof(UNICODE_NULL) + sizeof(SAMPR_RID_ENUMERATION)) > PreferedMaximumLength) + { + MoreEntries = TRUE; + break; + } + + RequiredLength += (NameLength + sizeof(UNICODE_NULL) + sizeof(SAMPR_RID_ENUMERATION)); + EnumCount++; EnumIndex++; } @@ -2210,6 +2238,9 @@ TRACE("EnumCount: %lu\n", EnumCount); TRACE("RequiredLength: %lu\n", RequiredLength); + if (!NT_SUCCESS(Status)) + goto done; + EnumBuffer = midl_user_allocate(sizeof(SAMPR_ENUMERATION_BUFFER)); if (EnumBuffer == NULL) { @@ -2233,10 +2264,15 @@ EnumIndex = *EnumerationContext; for (i = 0; i < EnumCount; i++, EnumIndex++) { - Status = SampRegEnumerateSubKey(AliasesKeyHandle, - EnumIndex, - 64 * sizeof(WCHAR), - AliasKeyName); + NameLength = 64 * sizeof(WCHAR); + DataLength = sizeof(ULONG); + Status = SampRegEnumerateValue(NamesKeyHandle, + EnumIndex, + UserName, + &NameLength, + NULL, + &Rid, + &DataLength); if (!NT_SUCCESS(Status)) { if (Status == STATUS_NO_MORE_ENTRIES) @@ -2245,53 +2281,28 @@ } TRACE("EnumIndex: %lu\n", EnumIndex); - TRACE("Alias key name: %S\n", AliasKeyName); - - Status = SampRegOpenKey(AliasesKeyHandle, - AliasKeyName, - KEY_READ, - &AliasKeyHandle); - TRACE("SampRegOpenKey returned %08lX\n", Status); - if (NT_SUCCESS(Status)) - { - DataLength = 0; - Status = SampRegQueryValue(AliasKeyHandle, - L"Name", - NULL, - NULL, - &DataLength); - TRACE("SampRegQueryValue returned %08lX\n", Status); - if (NT_SUCCESS(Status)) - { - EnumBuffer->Buffer[i].RelativeId = wcstoul(AliasKeyName, NULL, 16); - - EnumBuffer->Buffer[i].Name.Length = (USHORT)DataLength - sizeof(WCHAR); - EnumBuffer->Buffer[i].Name.MaximumLength = (USHORT)DataLength; - EnumBuffer->Buffer[i].Name.Buffer = midl_user_allocate(DataLength); - if (EnumBuffer->Buffer[i].Name.Buffer == NULL) - { - NtClose(AliasKeyHandle); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - Status = SampRegQueryValue(AliasKeyHandle, - L"Name", - NULL, - EnumBuffer->Buffer[i].Name.Buffer, - &DataLength); - TRACE("SampRegQueryValue returned %08lX\n", Status); - if (NT_SUCCESS(Status)) - { - TRACE("Alias name: %S\n", EnumBuffer->Buffer[i].Name.Buffer); - } - } - - NtClose(AliasKeyHandle); - - if (!NT_SUCCESS(Status)) - goto done; - } + TRACE("User name: %S\n", UserName); + TRACE("Name length: %lu\n", NameLength); + TRACE("RID: %lu\n", Rid); + + EnumBuffer->Buffer[i].RelativeId = Rid; + + EnumBuffer->Buffer[i].Name.Length = (USHORT)NameLength; + EnumBuffer->Buffer[i].Name.MaximumLength = (USHORT)(DataLength + sizeof(UNICODE_NULL)); + +/* FIXME: Disabled because of bugs in widl and rpcrt4 */ +#if 0 + EnumBuffer->Buffer[i].Name.Buffer = midl_user_allocate(EnumBuffer->Buffer[i].Name.MaximumLength); + if (EnumBuffer->Buffer[i].Name.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + memcpy(EnumBuffer->Buffer[i].Name.Buffer, + UserName, + EnumBuffer->Buffer[i].Name.Length); +#endif } done: @@ -2301,8 +2312,7 @@ *Buffer = EnumBuffer; *CountReturned = EnumCount; } - - if (!NT_SUCCESS(Status)) + else { *EnumerationContext = 0; *Buffer = NULL; @@ -2328,13 +2338,357 @@ } } - NtClose(AliasesKeyHandle); + if (NamesKeyHandle != NULL) + SampRegCloseKey(NamesKeyHandle); + + if (UsersKeyHandle != NULL) + SampRegCloseKey(UsersKeyHandle); if ((Status == STATUS_SUCCESS) && (MoreEntries == TRUE)) Status = STATUS_MORE_ENTRIES; return Status; } + + +/* Function 14 */ +NTSTATUS +NTAPI +SamrCreateAliasInDomain(IN SAMPR_HANDLE DomainHandle, + IN PRPC_UNICODE_STRING AccountName, + IN ACCESS_MASK DesiredAccess, + OUT SAMPR_HANDLE *AliasHandle, + OUT unsigned long *RelativeId) +{ + SAM_DOMAIN_FIXED_DATA FixedDomainData; + PSAM_DB_OBJECT DomainObject; + PSAM_DB_OBJECT AliasObject; + UNICODE_STRING EmptyString = RTL_CONSTANT_STRING(L""); + ULONG ulSize; + ULONG ulRid; + WCHAR szRid[9]; + NTSTATUS Status; + + TRACE("SamrCreateAliasInDomain(%p %p %lx %p %p)\n", + DomainHandle, AccountName, DesiredAccess, AliasHandle, RelativeId); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_CREATE_ALIAS, + &DomainObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Check if the alias name already exists in the domain */ + Status = SampCheckAccountNameInDomain(DomainObject, + AccountName->Buffer); + if (!NT_SUCCESS(Status)) + { + TRACE("Alias name \'%S\' already exists in domain (Status 0x%08lx)\n", + AccountName->Buffer, Status); + return Status; + } + + /* Get the fixed domain attributes */ + ulSize = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedDomainData, + &ulSize); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Increment the NextRid attribute */ + ulRid = FixedDomainData.NextRid; + FixedDomainData.NextRid++; + + /* Store the fixed domain attributes */ + Status = SampSetObjectAttribute(DomainObject, + L"F", + REG_BINARY, + &FixedDomainData, + ulSize); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + TRACE("RID: %lx\n", ulRid); + + /* Convert the RID into a string (hex) */ + swprintf(szRid, L"%08lX", ulRid); + + /* Create the alias object */ + Status = SampCreateDbObject(DomainObject, + L"Aliases", + szRid, + SamDbAliasObject, + DesiredAccess, + &AliasObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Add the account name for the alias object */ + Status = SampSetAccountNameInDomain(DomainObject, + L"Aliases", + AccountName->Buffer, + ulRid); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the Name attribute */ + Status = SampSetObjectAttribute(AliasObject, + L"Name", + REG_SZ, + (LPVOID)AccountName->Buffer, + AccountName->MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the Description attribute */ + Status = SampSetObjectAttribute(AliasObject, + L"Description", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + if (NT_SUCCESS(Status)) + { + *AliasHandle = (SAMPR_HANDLE)AliasObject; + *RelativeId = ulRid; + } + + TRACE("returns with status 0x%08lx\n", Status); + + return Status; +} + + +/* Function 15 */ +NTSTATUS +NTAPI +SamrEnumerateAliasesInDomain(IN SAMPR_HANDLE DomainHandle, + IN OUT unsigned long *EnumerationContext, + OUT PSAMPR_ENUMERATION_BUFFER *Buffer, + IN unsigned long PreferedMaximumLength, + OUT unsigned long *CountReturned) +{ + PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; + PSAM_DB_OBJECT DomainObject; + HANDLE AliasesKeyHandle = NULL; + HANDLE NamesKeyHandle = NULL; + WCHAR AliasName[64]; + ULONG EnumIndex; + ULONG EnumCount = 0; + ULONG RequiredLength = 0; + ULONG NameLength; + ULONG DataLength; + ULONG Rid; + ULONG i; + BOOLEAN MoreEntries = FALSE; + NTSTATUS Status; + + TRACE("SamrEnumerateAliasesInDomain(%p %p %p %lu %p)\n", + DomainHandle, EnumerationContext, Buffer, + PreferedMaximumLength, CountReturned); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_LIST_ACCOUNTS, + &DomainObject); + if (!NT_SUCCESS(Status)) + return Status; + + Status = SampRegOpenKey(DomainObject->KeyHandle, + L"Aliases", + KEY_READ, + &AliasesKeyHandle); + if (!NT_SUCCESS(Status)) + return Status; + + Status = SampRegOpenKey(AliasesKeyHandle, + L"Names", + KEY_READ, + &NamesKeyHandle); + if (!NT_SUCCESS(Status)) + goto done; + + TRACE("Part 1\n"); + + EnumIndex = *EnumerationContext; + + while (TRUE) + { + NameLength = 64 * sizeof(WCHAR); + Status = SampRegEnumerateValue(NamesKeyHandle, + EnumIndex, + AliasName, + &NameLength, + NULL, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_SUCCESS; + break; + } + + TRACE("EnumIndex: %lu\n", EnumIndex); + TRACE("Alias name: %S\n", AliasName); + TRACE("Name length: %lu\n", NameLength); + + if ((RequiredLength + NameLength + sizeof(UNICODE_NULL) + sizeof(SAMPR_RID_ENUMERATION)) > PreferedMaximumLength) + { + MoreEntries = TRUE; + break; + } + + RequiredLength += (NameLength + sizeof(UNICODE_NULL) + sizeof(SAMPR_RID_ENUMERATION)); + EnumCount++; + + EnumIndex++; + } + + TRACE("EnumCount: %lu\n", EnumCount); + TRACE("RequiredLength: %lu\n", RequiredLength); + + if (!NT_SUCCESS(Status)) + goto done; + + EnumBuffer = midl_user_allocate(sizeof(SAMPR_ENUMERATION_BUFFER)); + if (EnumBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + EnumBuffer->EntriesRead = EnumCount; + if (EnumCount == 0) + goto done; + + EnumBuffer->Buffer = midl_user_allocate(EnumCount * sizeof(SAMPR_RID_ENUMERATION)); + if (EnumBuffer->Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + TRACE("Part 2\n"); + + EnumIndex = *EnumerationContext; + for (i = 0; i < EnumCount; i++, EnumIndex++) + { + NameLength = 64 * sizeof(WCHAR); + DataLength = sizeof(ULONG); + Status = SampRegEnumerateValue(NamesKeyHandle, + EnumIndex, + AliasName, + &NameLength, + NULL, + &Rid, + &DataLength); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_SUCCESS; + break; + } + + TRACE("EnumIndex: %lu\n", EnumIndex); + TRACE("Alias name: %S\n", AliasName); + TRACE("Name length: %lu\n", NameLength); + TRACE("RID: %lu\n", Rid); + + EnumBuffer->Buffer[i].RelativeId = Rid; + + EnumBuffer->Buffer[i].Name.Length = (USHORT)NameLength; + EnumBuffer->Buffer[i].Name.MaximumLength = (USHORT)(DataLength + sizeof(UNICODE_NULL)); + +/* FIXME: Disabled because of bugs in widl and rpcrt4 */ +#if 0 + EnumBuffer->Buffer[i].Name.Buffer = midl_user_allocate(EnumBuffer->Buffer[i].Name.MaximumLength); + if (EnumBuffer->Buffer[i].Name.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + memcpy(EnumBuffer->Buffer[i].Name.Buffer, + AliasName, + EnumBuffer->Buffer[i].Name.Length); +#endif + } + +done: + if (NT_SUCCESS(Status)) + { + *EnumerationContext += EnumCount; + *Buffer = EnumBuffer; + *CountReturned = EnumCount; + } + else + { + *EnumerationContext = 0; + *Buffer = NULL; + *CountReturned = 0; + + if (EnumBuffer != NULL) + { + if (EnumBuffer->Buffer != NULL) + { + if (EnumBuffer->EntriesRead != 0) + { + for (i = 0; i < EnumBuffer->EntriesRead; i++) + { + if (EnumBuffer->Buffer[i].Name.Buffer != NULL) + midl_user_free(EnumBuffer->Buffer[i].Name.Buffer); + } + } + + midl_user_free(EnumBuffer->Buffer); + } + + midl_user_free(EnumBuffer); + } + } + + if (NamesKeyHandle != NULL) + SampRegCloseKey(NamesKeyHandle); + + if (AliasesKeyHandle != NULL) + SampRegCloseKey(AliasesKeyHandle); + + if ((Status == STATUS_SUCCESS) && (MoreEntries == TRUE)) + Status = STATUS_MORE_ENTRIES; + + return Status; +} + /* Function 16 */ NTSTATUS Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=57… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Thu Aug 2 20:09:24 2012 @@ -375,6 +375,23 @@ NTSTATUS NTAPI +SamEnumerateGroupsInDomain(IN SAM_HANDLE DomainHandle, + IN OUT PSAM_ENUMERATE_HANDLE EnumerationContext, + IN PVOID *Buffer, + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned); + +NTSTATUS +NTAPI +SamEnumerateUsersInDomain(IN SAM_HANDLE DomainHandle, + IN OUT PSAM_ENUMERATE_HANDLE EnumerationContext, + IN ULONG UserAccountControl, + OUT PVOID *Buffer, + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned); + +NTSTATUS +NTAPI SamFreeMemory(IN PVOID Buffer); NTSTATUS

1 0

[tkreuzer] 57028: [WIN32K] Return non-null value when a dc without a bitmap selected is passed to NtGdiSetDIBitsToDeviceInternal
by tkreuzer＠svn.reactos.org 02 Aug '12

02 Aug '12

Author: tkreuzer Date: Thu Aug 2 10:06:08 2012 New Revision: 57028 URL: http://svn.reactos.org/svn/reactos?rev=57028&view=rev Log: [WIN32K] Return non-null value when a dc without a bitmap selected is passed to NtGdiSetDIBitsToDeviceInternal Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Thu Aug 2 10:06:08 2012 @@ -433,6 +433,8 @@ goto Exit2; } + ScanLines = min(ScanLines, abs(bmi->bmiHeader.biHeight) - StartScan); + pDC = DC_LockDc(hDC); if (!pDC) { @@ -440,16 +442,21 @@ goto Exit2; } - pSurf = pDC->dclevel.pSurface; - if ((pDC->dctype == DC_TYPE_INFO) || !pSurf) + if (pDC->dctype == DC_TYPE_INFO) { DC_UnlockDc(pDC); goto Exit2; } + pSurf = pDC->dclevel.pSurface; + if (!pSurf) + { + DC_UnlockDc(pDC); + ret = ScanLines; + goto Exit2; + } + pDestSurf = &pSurf->SurfObj; - - ScanLines = min(ScanLines, abs(bmi->bmiHeader.biHeight) - StartScan); rcDest.left = XDest; rcDest.top = YDest;

1 0

[akhaldi] 57027: [WINETESTS] * Add several tests to the MSVC build.
by akhaldi＠svn.reactos.org 02 Aug '12

02 Aug '12

Author: akhaldi Date: Thu Aug 2 00:36:26 2012 New Revision: 57027 URL: http://svn.reactos.org/svn/reactos?rev=57027&view=rev Log: [WINETESTS] * Add several tests to the MSVC build. Modified: trunk/rostests/winetests/CMakeLists.txt trunk/rostests/winetests/mshtml/CMakeLists.txt trunk/rostests/winetests/oleaut32/typelib.c Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Thu Aug 2 00:36:26 2012 @@ -3,9 +3,7 @@ add_subdirectory(advapi32) add_subdirectory(advpack) -if(NOT MSVC) - add_subdirectory(amstream) # FIXME: msvc build. -endif() +add_subdirectory(amstream) add_subdirectory(atl) add_subdirectory(avifil32) add_subdirectory(browseui) @@ -43,18 +41,13 @@ add_subdirectory(mscms) add_subdirectory(mscoree) add_subdirectory(msctf) -if(NOT MSVC) - # FIXME: msvc build. - add_subdirectory(mshtml) - add_subdirectory(msi) -endif() +add_subdirectory(mshtml) +add_subdirectory(msi) add_subdirectory(mstask) add_subdirectory(msvcrt) add_subdirectory(msvcrtd) add_subdirectory(msvfw32) -if(NOT MSVC) - add_subdirectory(msxml3) # FIXME: msvc build. -endif() +add_subdirectory(msxml3) add_subdirectory(netapi32) add_subdirectory(ntdll) add_subdirectory(ntdsapi) @@ -62,9 +55,7 @@ add_subdirectory(odbccp32) add_subdirectory(ole32) add_subdirectory(oleacc) -if(NOT MSVC) - add_subdirectory(oleaut32) # FIXME: msvc build. -endif() +add_subdirectory(oleaut32) add_subdirectory(opengl32) add_subdirectory(pdh) add_subdirectory(psapi) @@ -88,9 +79,7 @@ add_subdirectory(sti) add_subdirectory(sxs) add_subdirectory(twain_32) -if(NOT MSVC) - add_subdirectory(urlmon) # FIXME: msvc build. -endif() +add_subdirectory(urlmon) add_subdirectory(user32) add_subdirectory(userenv) add_subdirectory(usp10) Modified: trunk/rostests/winetests/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/CMakeLis… ============================================================================== --- trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] Thu Aug 2 00:36:26 2012 @@ -1,9 +1,5 @@ -set_rc_compiler() - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE dom.c Modified: trunk/rostests/winetests/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/typeli… ============================================================================== --- trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] Thu Aug 2 00:36:26 2012 @@ -56,8 +56,8 @@ #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) -static HRESULT WINAPI (*pRegisterTypeLibForUser)(ITypeLib*,OLECHAR*,OLECHAR*); -static HRESULT WINAPI (*pUnRegisterTypeLibForUser)(REFGUID,WORD,WORD,LCID,SYSKIND); +static HRESULT (WINAPI *pRegisterTypeLibForUser)(ITypeLib*,OLECHAR*,OLECHAR*); +static HRESULT (WINAPI *pUnRegisterTypeLibForUser)(REFGUID,WORD,WORD,LCID,SYSKIND); static const WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0};

1 0

[akhaldi] 57026: [D3D8THK] * Welcome to MSVC build.
by akhaldi＠svn.reactos.org 02 Aug '12

02 Aug '12

Author: akhaldi Date: Thu Aug 2 00:23:07 2012 New Revision: 57026 URL: http://svn.reactos.org/svn/reactos?rev=57026&view=rev Log: [D3D8THK] * Welcome to MSVC build. Modified: trunk/reactos/dll/directx/CMakeLists.txt trunk/reactos/dll/directx/d3d8thk/CMakeLists.txt Modified: trunk/reactos/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/CMakeLists.txt… ============================================================================== --- trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] Thu Aug 2 00:23:07 2012 @@ -1,10 +1,6 @@ add_subdirectory(amstream) - -if (NOT MSVC) - add_subdirectory(d3d8thk) -endif() - +add_subdirectory(d3d8thk) #add_subdirectory(bdaplgin) #disabled in trunk #add_subdirectory(d3d8) #disabled in trunk, see wine subfolder #add_subdirectory(d3d9) #disabled in trunk, see wine subfolder Modified: trunk/reactos/dll/directx/d3d8thk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d8thk/CMakeL… ============================================================================== --- trunk/reactos/dll/directx/d3d8thk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d8thk/CMakeLists.txt [iso-8859-1] Thu Aug 2 00:23:07 2012 @@ -1,12 +1,7 @@ spec2def(d3d8thk.dll d3d8thk.spec) - add_library(d3d8thk SHARED d3d8thk.rc ${CMAKE_CURRENT_BINARY_DIR}/d3d8thk.def) - set_entrypoint(d3d8thk 0) - add_importlibs(d3d8thk gdi32) - add_dependencies(d3d8thk psdk) - add_cd_file(TARGET d3d8thk DESTINATION reactos/system32 FOR all)

1 0

[akhaldi] 57025: [AMSTREAM] * Welcome to MSVC build.
by akhaldi＠svn.reactos.org 02 Aug '12

02 Aug '12

Author: akhaldi Date: Thu Aug 2 00:03:51 2012 New Revision: 57025 URL: http://svn.reactos.org/svn/reactos?rev=57025&view=rev Log: [AMSTREAM] * Welcome to MSVC build. Modified: trunk/reactos/dll/directx/CMakeLists.txt trunk/reactos/dll/directx/amstream/CMakeLists.txt Modified: trunk/reactos/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/CMakeLists.txt… ============================================================================== --- trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] Thu Aug 2 00:03:51 2012 @@ -1,8 +1,10 @@ + +add_subdirectory(amstream) if (NOT MSVC) -add_subdirectory(amstream) -add_subdirectory(d3d8thk) + add_subdirectory(d3d8thk) endif() + #add_subdirectory(bdaplgin) #disabled in trunk #add_subdirectory(d3d8) #disabled in trunk, see wine subfolder #add_subdirectory(d3d9) #disabled in trunk, see wine subfolder Modified: trunk/reactos/dll/directx/amstream/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/amstream/CMake… ============================================================================== --- trunk/reactos/dll/directx/amstream/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/amstream/CMakeLists.txt [iso-8859-1] Thu Aug 2 00:03:51 2012 @@ -6,7 +6,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -set_rc_compiler() spec2def(amstream.dll amstream.spec) add_library(amstream SHARED

1 0

[akhaldi] 57024: [STDOLE32.TLB] * Welcome to MSVC build.
by akhaldi＠svn.reactos.org 01 Aug '12

01 Aug '12

Author: akhaldi Date: Wed Aug 1 23:54:07 2012 New Revision: 57024 URL: http://svn.reactos.org/svn/reactos?rev=57024&view=rev Log: [STDOLE32.TLB] * Welcome to MSVC build. Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Wed Aug 1 23:54:07 2012 @@ -180,9 +180,7 @@ add_subdirectory(spoolss) add_subdirectory(srclient) add_subdirectory(stdole2.tlb) -if(NOT MSVC) - add_subdirectory(stdole32.tlb) # FIXME: msvc build. -endif() +add_subdirectory(stdole32.tlb) add_subdirectory(sti) add_subdirectory(sxs) add_subdirectory(syssetup) Modified: trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/CMa… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] Wed Aug 1 23:54:07 2012 @@ -4,7 +4,6 @@ add_typelib(std_ole_v1.idl) -set_rc_compiler() spec2def(stdole32.tlb stdole32.tlb.spec) list(APPEND SOURCE

1 0

[tkreuzer] 57023: [WIN32K] - Implement CaptureUnicodeStringOrAtom, which handles user mode class names or atoms, and use it in some places. - Fix a number of format strings
by tkreuzer＠svn.reactos.org 01 Aug '12

01 Aug '12

Author: tkreuzer Date: Wed Aug 1 23:52:43 2012 New Revision: 57023 URL: http://svn.reactos.org/svn/reactos?rev=57023&view=rev Log: [WIN32K] - Implement CaptureUnicodeStringOrAtom, which handles user mode class names or atoms, and use it in some places. - Fix a number of format strings Modified: trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/class.h Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Wed Aug 1 23:52:43 2012 @@ -110,6 +110,72 @@ return FALSE; } +_Must_inspect_result_ +NTSTATUS +NTAPI +CaptureUnicodeStringOrAtom( + _Out_ PUNICODE_STRING pustrOut, + __in_data_source(USER_MODE) _In_ PUNICODE_STRING pustrUnsafe) +{ + NTSTATUS Status = STATUS_SUCCESS; + + /* Default to NULL */ + pustrOut->Buffer = NULL; + + _SEH2_TRY + { + ProbeForRead(pustrUnsafe, sizeof(UNICODE_STRING), 1); + + /* Validate the string */ + if ((pustrUnsafe->Length & 1) || (pustrUnsafe->Buffer == NULL)) + { + /* This is not legal */ + _SEH2_YIELD(return STATUS_INVALID_PARAMETER); + } + + /* Check if this is an atom */ + if (IS_ATOM(pustrUnsafe->Buffer)) + { + /* Copy the atom, length is 0 */ + pustrOut->MaximumLength = pustrOut->Length = 0; + pustrOut->Buffer = pustrUnsafe->Buffer; + } + else + { + /* Get the length, maximum length includes zero termination */ + pustrOut->Length = pustrUnsafe->Length; + pustrOut->MaximumLength = pustrOut->Length + sizeof(WCHAR); + + /* Allocate a buffer */ + pustrOut->Buffer = ExAllocatePoolWithTag(PagedPool, + pustrOut->MaximumLength, + TAG_STRING); + if (!pustrOut->Buffer) + { + _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); + } + + /* Copy the string and zero terminate it */ + ProbeForRead(pustrUnsafe->Buffer, pustrOut->Length, 1); + RtlCopyMemory(pustrOut->Buffer, pustrUnsafe->Buffer, pustrOut->Length); + pustrOut->Buffer[pustrOut->Length / sizeof(WCHAR)] = L'\0'; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Check if we already allocated a buffer */ + if (pustrOut->Buffer) + { + /* Free the buffer */ + ExFreePoolWithTag(pustrOut->Buffer, TAG_STRING); + Status = _SEH2_GetExceptionCode(); + } + } + _SEH2_END; + + return Status; +} + /* WINDOWCLASS ***************************************************************/ static VOID @@ -503,7 +569,7 @@ /* Simply clone the class */ RtlCopyMemory( Class, BaseClass, ClassSize); - TRACE("Clone Class 0x%x hM 0x%x\n %S\n",Class, Class->hModule, Class->lpszClientUnicodeMenuName); + TRACE("Clone Class 0x%p hM 0x%p\n %S\n",Class, Class->hModule, Class->lpszClientUnicodeMenuName); /* Restore module address if default user class Ref: Bug 4778 */ if ( Class->hModule != hModClient && @@ -511,7 +577,7 @@ Class->fnid >= FNID_BUTTON ) { Class->hModule = hModClient; - TRACE("Clone Class 0x%x Reset hM 0x%x\n",Class, Class->hModule); + TRACE("Clone Class 0x%p Reset hM 0x%p\n",Class, Class->hModule); } /* Update some pointers and link the class */ @@ -631,7 +697,7 @@ { ASSERT(Class->pclsBase == Class); - TRACE("IntDereferenceClass 0x%x\n", Class); + TRACE("IntDereferenceClass 0x%p\n", Class); /* Check if there are clones of the class on other desktops, link the first clone in if possible. If there are no clones then leave the class on the desktop heap. It will get moved @@ -669,7 +735,7 @@ } else { - TRACE("IntDereferenceClass1 0x%x\n", Class); + TRACE("IntDereferenceClass1 0x%p\n", Class); /* Locate the cloned class and unlink it */ PrevLink = &BaseClass->pclsClone; @@ -1032,7 +1098,7 @@ EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); } - TRACE("Created class 0x%x with name %wZ and proc 0x%x for atom 0x%x and hInstance 0x%x, global %d\n", + TRACE("Created class 0x%p with name %wZ and proc 0x%p for atom 0x%x and hInstance 0x%p, global %u\n", Class, ClassName, Class->lpfnWndProc, Atom, Class->hModule, Class->Global); return Class; @@ -1068,8 +1134,10 @@ } BOOL -IntGetAtomFromStringOrAtom(IN PUNICODE_STRING ClassName, - OUT RTL_ATOM *Atom) +NTAPI +IntGetAtomFromStringOrAtom( + _In_ PUNICODE_STRING ClassName, + _Out_ RTL_ATOM *Atom) { BOOL Ret = FALSE; @@ -1078,6 +1146,8 @@ WCHAR szBuf[65]; PWSTR AtomName; NTSTATUS Status; + + *Atom = 0; /* NOTE: Caller has to protect the call with SEH! */ @@ -1134,11 +1204,12 @@ } RTL_ATOM -IntGetClassAtom(IN PUNICODE_STRING ClassName, - IN HINSTANCE hInstance OPTIONAL, - IN PPROCESSINFO pi OPTIONAL, - OUT PCLS *BaseClass OPTIONAL, - OUT PCLS **Link OPTIONAL) +IntGetClassAtom( + _In_ PUNICODE_STRING ClassName, + IN HINSTANCE hInstance OPTIONAL, + IN PPROCESSINFO pi OPTIONAL, + OUT PCLS *BaseClass OPTIONAL, + OUT PCLS **Link OPTIONAL) { RTL_ATOM Atom = (RTL_ATOM)0; @@ -1160,7 +1231,7 @@ &pi->pclsPrivateList, Link); if (Class != NULL) - { TRACE("Step 1: 0x%x\n",Class ); + { TRACE("Step 1: 0x%p\n",Class ); goto FoundClass; } @@ -1171,7 +1242,7 @@ &pi->pclsPublicList, Link); if (Class != NULL) - { TRACE("Step 2: 0x%x 0x%x\n",Class, Class->hModule); + { TRACE("Step 2: 0x%p 0x%p\n",Class, Class->hModule); goto FoundClass; } @@ -1181,7 +1252,7 @@ &pi->pclsPrivateList, Link); if (Class != NULL) - { TRACE("Step 3: 0x%x\n",Class ); + { TRACE("Step 3: 0x%p\n",Class ); goto FoundClass; } @@ -1194,7 +1265,7 @@ { EngSetLastError(ERROR_CLASS_DOES_NOT_EXIST); return (RTL_ATOM)0; - }else{TRACE("Step 4: 0x%x\n",Class );} + }else{TRACE("Step 4: 0x%p\n",Class );} FoundClass: *BaseClass = Class; @@ -1219,7 +1290,7 @@ /* Check the class. */ - TRACE("Finding Class %wZ for hInstance 0x%x\n", ClassName, hInstance); + TRACE("Finding Class %wZ for hInstance 0x%p\n", ClassName, hInstance); ClassAtom = IntGetClassAtom(ClassName, hInstance, @@ -1231,7 +1302,7 @@ { if (IS_ATOM(ClassName->Buffer)) { - ERR("Class 0x%p not found\n", (DWORD_PTR) ClassName->Buffer); + ERR("Class 0x%p not found\n", ClassName->Buffer); } else { @@ -1242,7 +1313,7 @@ return NULL; } - TRACE("Referencing Class 0x%x with atom 0x%x\n", Class, ClassAtom); + TRACE("Referencing Class 0x%p with atom 0x%x\n", Class, ClassAtom); Class = IntReferenceClass(Class, ClassLink, pti->rpdesk); @@ -1287,7 +1358,7 @@ if (Class != NULL && !Class->Global) { // Local class already exists - TRACE("Local Class 0x%p does already exist!\n", ClassAtom); + TRACE("Local Class 0x%x does already exist!\n", ClassAtom); EngSetLastError(ERROR_CLASS_ALREADY_EXISTS); return (RTL_ATOM)0; } @@ -1301,7 +1372,7 @@ if (Class != NULL && Class->Global) { - TRACE("Global Class 0x%p does already exist!\n", ClassAtom); + TRACE("Global Class 0x%x does already exist!\n", ClassAtom); EngSetLastError(ERROR_CLASS_ALREADY_EXISTS); return (RTL_ATOM)0; } @@ -1352,7 +1423,7 @@ pi = GetW32ProcessInfo(); - TRACE("UserUnregisterClass(%wZ, 0x%x)\n", ClassName, hInstance); + TRACE("UserUnregisterClass(%wZ, 0x%p)\n", ClassName, hInstance); /* NOTE: Accessing the buffer in ClassName may raise an exception! */ ClassAtom = IntGetClassAtom(ClassName, @@ -1371,7 +1442,7 @@ if (Class->cWndReferenceCount != 0 || Class->pclsClone != NULL) { - TRACE("UserUnregisterClass: Class has a Window. Ct %d : Clone 0x%x\n", Class->cWndReferenceCount, Class->pclsClone); + TRACE("UserUnregisterClass: Class has a Window. Ct %u : Clone 0x%p\n", Class->cWndReferenceCount, Class->pclsClone); EngSetLastError(ERROR_CLASS_HAS_WINDOWS); return FALSE; } @@ -1384,7 +1455,7 @@ if (NT_SUCCESS(IntDeregisterClassAtom(Class->atomClassName))) { - TRACE("Class 0x%x\n", Class); + TRACE("Class 0x%p\n", Class); TRACE("UserUnregisterClass: Good Exit!\n"); /* Finally free the resources */ IntDestroyClass(Class); @@ -2184,196 +2255,135 @@ return(0); } -BOOL APIENTRY -NtUserUnregisterClass(IN PUNICODE_STRING ClassNameOrAtom, - IN HINSTANCE hInstance, - OUT PCLSMENUNAME pClassMenuName) -{ - UNICODE_STRING CapturedClassName; - BOOL Ret = FALSE; +BOOL +APIENTRY +NtUserUnregisterClass( + IN PUNICODE_STRING ClassNameOrAtom, + IN HINSTANCE hInstance, + OUT PCLSMENUNAME pClassMenuName) +{ + UNICODE_STRING SafeClassName; + NTSTATUS Status; + BOOL Ret; + + Status = CaptureUnicodeStringOrAtom(&SafeClassName, ClassNameOrAtom); + if (!NT_SUCCESS(Status)) + { + ERR("Error capturing the class name\n"); + SetLastNtError(Status); + return FALSE; + } UserEnterExclusive(); - _SEH2_TRY - { - /* Probe the paramters */ - CapturedClassName = ProbeForReadUnicodeString(ClassNameOrAtom); - if (CapturedClassName.Length & 1) - { - goto InvalidParameter; - } - - if (CapturedClassName.Length != 0) - { - ProbeForRead(CapturedClassName.Buffer, - CapturedClassName.Length, - sizeof(WCHAR)); - } - else - { - if (!IS_ATOM(CapturedClassName.Buffer)) - { -InvalidParameter: - EngSetLastError(ERROR_INVALID_PARAMETER); - _SEH2_LEAVE; - } - } - - /* Unregister the class */ - Ret = UserUnregisterClass(&CapturedClassName, - hInstance, - NULL); // Null for now~ - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - } - _SEH2_END; + /* Unregister the class */ + Ret = UserUnregisterClass(&SafeClassName, hInstance, NULL); // Null for now~ UserLeave(); + + if (SafeClassName.Buffer && !IS_ATOM(SafeClassName.Buffer)) + ExFreePoolWithTag(SafeClassName.Buffer, TAG_STRING); + return Ret; } + /* NOTE: For system classes hInstance is not NULL here, but User32Instance */ -BOOL APIENTRY +BOOL +APIENTRY NtUserGetClassInfo( HINSTANCE hInstance, PUNICODE_STRING ClassName, LPWNDCLASSEXW lpWndClassEx, LPWSTR *ppszMenuName, - BOOL Ansi) -{ - UNICODE_STRING CapturedClassName, SafeClassName; - WNDCLASSEXW Safewcexw; - PCLS Class; - RTL_ATOM ClassAtom = 0; - PPROCESSINFO ppi; - BOOL Ret = TRUE; - - /* NOTE: Need exclusive lock because getting the wndproc might require the - creation of a call procedure handle */ - UserEnterExclusive(); - - ppi = GetW32ProcessInfo(); - - if ( !(ppi->W32PF_flags & W32PF_CLASSESREGISTERED )) - { - UserRegisterSystemClasses(); - } - - _SEH2_TRY - { - /* Probe the paramters */ - CapturedClassName = ProbeForReadUnicodeString(ClassName); - - if (CapturedClassName.Length == 0) - { - TRACE("hInst %p atom %04X lpWndClassEx %p Ansi %d\n", hInstance, CapturedClassName.Buffer, lpWndClassEx, Ansi); - } - else - { - TRACE("hInst %p class %wZ lpWndClassEx %p Ansi %d\n", hInstance, &CapturedClassName, lpWndClassEx, Ansi); - } - - if (CapturedClassName.Length & 1) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - Ret = FALSE; - _SEH2_LEAVE; - } - - if (CapturedClassName.Length != 0) - { - ProbeForRead( CapturedClassName.Buffer, - CapturedClassName.Length, - sizeof(WCHAR)); - - RtlInitUnicodeString( &SafeClassName, CapturedClassName.Buffer); - - SafeClassName.Buffer = ExAllocatePoolWithTag( PagedPool, - SafeClassName.MaximumLength, - TAG_STRING); - RtlCopyMemory( SafeClassName.Buffer, - CapturedClassName.Buffer, - SafeClassName.MaximumLength); - } - else - { - if (!IS_ATOM(CapturedClassName.Buffer)) - { - ERR("NtUserGetClassInfo() got ClassName instead of Atom!\n"); - EngSetLastError(ERROR_INVALID_PARAMETER); + BOOL bAnsi) +{ + UNICODE_STRING SafeClassName; + WNDCLASSEXW Safewcexw; + PCLS Class; + RTL_ATOM ClassAtom = 0; + PPROCESSINFO ppi; + BOOL Ret = TRUE; + NTSTATUS Status; + + _SEH2_TRY + { + ProbeForWrite( lpWndClassEx, sizeof(WNDCLASSEXW), sizeof(ULONG)); + RtlCopyMemory( &Safewcexw, lpWndClassEx, sizeof(WNDCLASSEXW)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(return FALSE); + } + _SEH2_END; + + Status = CaptureUnicodeStringOrAtom(&SafeClassName, ClassName); + if (!NT_SUCCESS(Status)) + { + ERR("Error capturing the class name\n"); + SetLastNtError(Status); + return FALSE; + } + + // If null instance use client. + if (!hInstance) hInstance = hModClient; + + TRACE("GetClassInfo(%wZ, 0x%x)\n", SafeClassName, hInstance); + + /* NOTE: Need exclusive lock because getting the wndproc might require the + creation of a call procedure handle */ + UserEnterExclusive(); + + ppi = GetW32ProcessInfo(); + if (!(ppi->W32PF_flags & W32PF_CLASSESREGISTERED)) + { + UserRegisterSystemClasses(); + } + + ClassAtom = IntGetClassAtom(&SafeClassName, + hInstance, + ppi, + &Class, + NULL); + if (ClassAtom != (RTL_ATOM)0) + { + Ret = UserGetClassInfo(Class, &Safewcexw, bAnsi, hInstance); + } + else + { + EngSetLastError(ERROR_CLASS_DOES_NOT_EXIST); + Ret = FALSE; + } + + UserLeave(); + + if (Ret) + { + _SEH2_TRY + { + /* Emulate Function. */ + if (ppszMenuName) *ppszMenuName = (LPWSTR)Safewcexw.lpszMenuName; + + RtlCopyMemory(lpWndClassEx, &Safewcexw, sizeof(WNDCLASSEXW)); + + // From Wine: + /* We must return the atom of the class here instead of just TRUE. */ + /* Undocumented behavior! Return the class atom as a BOOL! */ + Ret = (BOOL)ClassAtom; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + EngSetLastError(ERROR_CLASS_DOES_NOT_EXIST); Ret = FALSE; - _SEH2_LEAVE; - } - - SafeClassName.Buffer = CapturedClassName.Buffer; - SafeClassName.Length = 0; - SafeClassName.MaximumLength = 0; - } - - ProbeForWrite( lpWndClassEx, sizeof(WNDCLASSEXW), sizeof(ULONG)); - - RtlCopyMemory( &Safewcexw, lpWndClassEx, sizeof(WNDCLASSEXW)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - Ret = FALSE; - } - _SEH2_END; - - // If null instance use client. - if (!hInstance) hInstance = hModClient; - - if (Ret) - { - TRACE("GetClassInfo(%wZ, 0x%x)\n", SafeClassName, hInstance); - ClassAtom = IntGetClassAtom( &SafeClassName, - hInstance, - ppi, - &Class, - NULL); - if (ClassAtom != (RTL_ATOM)0) - { - if (hInstance == NULL) hInstance = hModClient; - - Ret = UserGetClassInfo( Class, - &Safewcexw, - Ansi, - hInstance); - } - else - { - EngSetLastError(ERROR_CLASS_DOES_NOT_EXIST); - Ret = FALSE; - } - } - _SEH2_TRY - { - if (Ret) - { - /* Emulate Function. */ - if (ppszMenuName) *ppszMenuName = (LPWSTR)Safewcexw.lpszMenuName; - - RtlCopyMemory(lpWndClassEx, &Safewcexw, sizeof(WNDCLASSEXW)); - - // From Wine: - /* We must return the atom of the class here instead of just TRUE. */ - /* Undocumented behavior! Return the class atom as a BOOL! */ - Ret = (BOOL)ClassAtom; - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - EngSetLastError(ERROR_CLASS_DOES_NOT_EXIST); - Ret = FALSE; - } - _SEH2_END; - - if (SafeClassName.Length) ExFreePoolWithTag(SafeClassName.Buffer, TAG_STRING); - UserLeave(); - return Ret; + } + _SEH2_END; + } + + if (!IS_ATOM(SafeClassName.Buffer)) + ExFreePoolWithTag(SafeClassName.Buffer, TAG_STRING); + + return Ret; } @@ -2430,78 +2440,49 @@ } /* Return Pointer to Class structure. */ -PCLS APIENTRY -NtUserGetWOWClass(HINSTANCE hInstance, - PUNICODE_STRING ClassName) -{ - UNICODE_STRING SafeClassName; - PPROCESSINFO pi; - PCLS Class = NULL; - RTL_ATOM ClassAtom = 0; - BOOL Hit = FALSE; - - UserEnterExclusive(); - - pi = GetW32ProcessInfo(); - - _SEH2_TRY - { - if (ClassName->Length != 0) - { - ProbeForRead( ClassName->Buffer, - ClassName->Length, - sizeof(WCHAR)); - - RtlInitUnicodeString( &SafeClassName, ClassName->Buffer); - - SafeClassName.Buffer = ExAllocatePoolWithTag( PagedPool, - SafeClassName.MaximumLength, - TAG_STRING); - RtlCopyMemory( SafeClassName.Buffer, - ClassName->Buffer, - SafeClassName.MaximumLength); - } - else - { - if (!IS_ATOM(ClassName->Buffer)) - { - ERR("NtUserGetWOWClass() got ClassName instead of Atom!\n"); - Hit = TRUE; - } - else - { - SafeClassName.Buffer = ClassName->Buffer; - SafeClassName.Length = 0; - SafeClassName.MaximumLength = 0; - } - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - EngSetLastError(ERROR_CLASS_DOES_NOT_EXIST); - Hit = TRUE; - } - _SEH2_END; - - if (!Hit) - { - ClassAtom = IntGetClassAtom( &SafeClassName, - hInstance, - pi, - &Class, - NULL); - if (!ClassAtom) - { +PCLS +APIENTRY +NtUserGetWOWClass( + HINSTANCE hInstance, + PUNICODE_STRING ClassName) +{ + UNICODE_STRING SafeClassName; + PPROCESSINFO pi; + PCLS Class = NULL; + RTL_ATOM ClassAtom = 0; + NTSTATUS Status; + + Status = CaptureUnicodeStringOrAtom(&SafeClassName, ClassName); + if (!NT_SUCCESS(Status)) + { + ERR("Error capturing the class name\n"); + SetLastNtError(Status); + return FALSE; + } + + UserEnterExclusive(); + + pi = GetW32ProcessInfo(); + + ClassAtom = IntGetClassAtom(&SafeClassName, + hInstance, + pi, + &Class, + NULL); + if (!ClassAtom) + { EngSetLastError(ERROR_CLASS_DOES_NOT_EXIST); - } - } - - if (SafeClassName.Length) ExFreePoolWithTag(SafeClassName.Buffer, TAG_STRING); - UserLeave(); + } + + + if (SafeClassName.Buffer && !IS_ATOM(SafeClassName.Buffer)) + ExFreePoolWithTag(SafeClassName.Buffer, TAG_STRING); + + UserLeave(); // // Don't forget to use DesktopPtrToUser( ? ) with return pointer in user space. // - return Class; + return Class; } /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.h [iso-8859-1] Wed Aug 1 23:52:43 2012 @@ -48,8 +48,10 @@ IN PCALLPROCDATA CallProc); BOOL -IntGetAtomFromStringOrAtom(IN PUNICODE_STRING ClassName, - OUT RTL_ATOM *Atom); +NTAPI +IntGetAtomFromStringOrAtom( + _In_ PUNICODE_STRING ClassName, + _Out_ RTL_ATOM *Atom); BOOL IntCheckProcessDesktopClasses(IN PDESKTOP Desktop,

1 0

[akhaldi] 57022: [MSIEXEC] * Welcome to MSVC build.
by akhaldi＠svn.reactos.org 01 Aug '12

01 Aug '12

Author: akhaldi Date: Wed Aug 1 23:51:06 2012 New Revision: 57022 URL: http://svn.reactos.org/svn/reactos?rev=57022&view=rev Log: [MSIEXEC] * Welcome to MSVC build. Modified: trunk/reactos/base/system/CMakeLists.txt trunk/reactos/base/system/msiexec/CMakeLists.txt Modified: trunk/reactos/base/system/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/CMakeLists.txt… ============================================================================== --- trunk/reactos/base/system/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/CMakeLists.txt [iso-8859-1] Wed Aug 1 23:51:06 2012 @@ -5,9 +5,7 @@ add_subdirectory(expand) add_subdirectory(format) add_subdirectory(lsass) -if(NOT MSVC) - add_subdirectory(msiexec) # FIXME: msvc build. -endif() +add_subdirectory(msiexec) add_subdirectory(regsvr32) add_subdirectory(rundll32) add_subdirectory(runonce) Modified: trunk/reactos/base/system/msiexec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/CMakeL… ============================================================================== --- trunk/reactos/base/system/msiexec/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/CMakeLists.txt [iso-8859-1] Wed Aug 1 23:51:06 2012 @@ -2,8 +2,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/wine) - -set_rc_compiler() add_executable(msiexec msiexec.c

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs