Ros-diffs August 2012

ros-diffs@reactos.org

14 participants
198 discussions

[ekohl] 57158: [ADVAPI32/LSASRV] - Implement LsaCreateSecret/LsarCreateSecret, LsaOpenSecret/LsarOpenSecret, LsaGetSystemAccessAccount/ LsarGetSystemAccessAccount and LsarSetSystemAccessAccount - I...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Aug 25 15:40:06 2012 New Revision: 57158 URL: http://svn.reactos.org/svn/reactos?rev=57158&view=rev Log: [ADVAPI32/LSASRV] - Implement LsaCreateSecret/LsarCreateSecret, LsaOpenSecret/LsarOpenSecret, LsaGetSystemAccessAccount/ LsarGetSystemAccessAccount and LsarSetSystemAccessAccount - Improve some TRACE messages. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Sat Aug 25 15:40:06 2012 @@ -349,7 +349,7 @@ @ stub LsaClearAuditLog @ stdcall LsaClose(ptr) @ stdcall LsaCreateAccount(ptr ptr long ptr) -@ stub LsaCreateSecret +@ stdcall LsaCreateSecret(ptr ptr long ptr) @ stdcall LsaCreateTrustedDomain(ptr ptr long ptr) @ stdcall LsaCreateTrustedDomainEx(ptr ptr ptr long ptr) @ stdcall LsaDelete(ptr) @@ -364,7 +364,7 @@ @ stdcall LsaFreeMemory(ptr) @ stub LsaGetQuotasForAccount @ stub LsaGetRemoteUserName -@ stub LsaGetSystemAccessAccount +@ stdcall LsaGetSystemAccessAccount(ptr ptr) @ stdcall LsaGetUserName(ptr ptr) @ stub LsaICLookupNames @ stub LsaICLookupNamesWithCreds @@ -380,7 +380,7 @@ @ stdcall LsaOpenAccount(ptr ptr long ptr) @ stdcall LsaOpenPolicy(ptr ptr long ptr) @ stub LsaOpenPolicySce -@ stub LsaOpenSecret +@ stdcall LsaOpenSecret(ptr ptr long ptr) @ stub LsaOpenTrustedDomain @ stdcall LsaOpenTrustedDomainByName(ptr ptr long ptr) @ stdcall LsaQueryDomainInformationPolicy(ptr long ptr) Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sat Aug 25 15:40:06 2012 @@ -152,7 +152,8 @@ LSAPR_USER_RIGHT_SET UserRightSet; NTSTATUS Status; - TRACE("(%p,%p,%p,0x%08x) stub\n", PolicyHandle, AccountSid, UserRights, CountOfRights); + TRACE("LsaAddAccountRights(%p %p %p 0x%08x)\n", + PolicyHandle, AccountSid, UserRights, CountOfRights); UserRightSet.Entries = CountOfRights; UserRightSet.UserRights = (PRPC_UNICODE_STRING)UserRights; @@ -184,7 +185,8 @@ { NTSTATUS Status; - TRACE("(%p,%p) stub\n", AccountHandle, PrivilegeSet); + TRACE("LsaAddPrivilegesToAccount(%p %p)\n", + AccountHandle, PrivilegeSet); RpcTryExcept { @@ -213,7 +215,8 @@ { NTSTATUS Status; - TRACE("(%p,%p,0x%08x,%p)\n", PolicyHandle, AccountSid, DesiredAccess, AccountHandle); + TRACE("LsaCreateAccount(%p %p 0x%08x %p)\n", + PolicyHandle, AccountSid, DesiredAccess, AccountHandle); RpcTryExcept { @@ -221,6 +224,38 @@ AccountSid, DesiredAccess, AccountHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaCreateSecret(IN LSA_HANDLE PolicyHandle, + IN PLSA_UNICODE_STRING SecretName, + IN ACCESS_MASK DesiredAccess, + OUT PLSA_HANDLE SecretHandle) +{ + NTSTATUS Status; + + TRACE("LsaCreateSecret(%p %p 0x%08lx %p)\n", + PolicyHandle, SecretName, DesiredAccess, SecretHandle); + + RpcTryExcept + { + Status = LsarCreateSecret((LSAPR_HANDLE)PolicyHandle, + (PRPC_UNICODE_STRING)SecretName, + DesiredAccess, + SecretHandle); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { @@ -441,6 +476,33 @@ { TRACE("(%p)\n", Buffer); return RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); +} + + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaGetSystemAccessAccount(IN LSA_HANDLE AccountHandle, + OUT PULONG SystemAccess) +{ + NTSTATUS Status; + + TRACE("(%p,%p)\n", AccountHandle, SystemAccess); + + RpcTryExcept + { + Status = LsarGetSystemAccessAccount((LSAPR_HANDLE)AccountHandle, + (ACCESS_MASK *)SystemAccess); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; } @@ -770,6 +832,39 @@ } +NTSTATUS +WINAPI +LsaOpenSecret(IN LSA_HANDLE PolicyHandle, + IN PLSA_UNICODE_STRING SecretName, + IN ACCESS_MASK DesiredAccess, + OUT PLSA_HANDLE SecretHandle) +{ + NTSTATUS Status; + + TRACE("LsaOpenSecret(%p %p 0x%08x %p)\n", + PolicyHandle, SecretName, DesiredAccess, SecretHandle); + + RpcTryExcept + { + *SecretHandle = NULL; + + Status = LsarOpenSecret((LSAPR_HANDLE)PolicyHandle, + (PRPC_UNICODE_STRING)SecretName, + DesiredAccess, + SecretHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + TRACE("LsaOpenSecret() done (Status: 0x%08lx)\n", Status); + + return Status; +} + + /* * @implemented */ Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sat Aug 25 15:40:06 2012 @@ -11,14 +11,15 @@ #include "lsasrv.h" +WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); + + +/* GLOBALS *****************************************************************/ static RTL_CRITICAL_SECTION PolicyHandleTableLock; -WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); - /* FUNCTIONS ***************************************************************/ - VOID LsarStartRpcServer(VOID) @@ -629,8 +630,87 @@ ACCESS_MASK DesiredAccess, LSAPR_HANDLE *SecretHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT PolicyObject; + PLSA_DB_OBJECT SecretsObject = NULL; + PLSA_DB_OBJECT SecretObject = NULL; + LARGE_INTEGER Time; + NTSTATUS Status = STATUS_SUCCESS; + + /* Validate the PolicyHandle */ + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, + POLICY_CREATE_SECRET, + &PolicyObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapValidateDbObject returned 0x%08lx\n", Status); + return Status; + } + + /* Open the Secrets object */ + Status = LsapOpenDbObject(PolicyObject, + L"Secrets", + LsaDbContainerObject, + 0, + &SecretsObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapCreateDbObject (Secrets) failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Get the current time */ + Status = NtQuerySystemTime(&Time); + if (!NT_SUCCESS(Status)) + { + ERR("NtQuerySystemTime failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Create the Secret object */ + Status = LsapCreateDbObject(SecretsObject, + SecretName->Buffer, + LsaDbSecretObject, + DesiredAccess, + &SecretObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapCreateDbObject (Secret) failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Set the CurrentTime attribute */ + Status = LsapSetObjectAttribute(SecretObject, + L"CurrentTime", + (PVOID)&Time, + sizeof(LARGE_INTEGER)); + if (!NT_SUCCESS(Status)) + { + ERR("LsapSetObjectAttribute (CurrentTime) failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Set the OldTime attribute */ + Status = LsapSetObjectAttribute(SecretObject, + L"OldTime", + (PVOID)&Time, + sizeof(LARGE_INTEGER)); + +done: + if (!NT_SUCCESS(Status)) + { + if (SecretObject != NULL) + LsapCloseDbObject(SecretObject); + } + else + { + *SecretHandle = (LSAPR_HANDLE)SecretObject; + } + + if (SecretsObject != NULL) + LsapCloseDbObject(SecretsObject); + + return STATUS_SUCCESS; } @@ -958,8 +1038,28 @@ LSAPR_HANDLE AccountHandle, ACCESS_MASK *SystemAccess) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT AccountObject; + ULONG Size; + NTSTATUS Status; + + /* Validate the account handle */ + Status = LsapValidateDbObject(AccountHandle, + LsaDbAccountObject, + ACCOUNT_VIEW, + &AccountObject); + if (!NT_SUCCESS(Status)) + { + ERR("Invalid handle (Status %lx)\n", Status); + return Status; + } + + /* Get the system access flags */ + Status = LsapGetObjectAttribute(AccountObject, + L"ActSysAc", + SystemAccess, + &Size); + + return Status; } @@ -968,8 +1068,27 @@ LSAPR_HANDLE AccountHandle, ACCESS_MASK SystemAccess) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT AccountObject; + NTSTATUS Status; + + /* Validate the account handle */ + Status = LsapValidateDbObject(AccountHandle, + LsaDbAccountObject, + ACCOUNT_ADJUST_SYSTEM_ACCESS, + &AccountObject); + if (!NT_SUCCESS(Status)) + { + ERR("Invalid handle (Status %lx)\n", Status); + return Status; + } + + /* Set the system access flags */ + Status = LsapSetObjectAttribute(AccountObject, + L"ActSysAc", + &SystemAccess, + sizeof(ACCESS_MASK)); + + return Status; } @@ -1014,8 +1133,61 @@ ACCESS_MASK DesiredAccess, LSAPR_HANDLE *SecretHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT PolicyObject; + PLSA_DB_OBJECT SecretsObject = NULL; + PLSA_DB_OBJECT SecretObject = NULL; + NTSTATUS Status = STATUS_SUCCESS; + + /* Validate the PolicyHandle */ + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, + POLICY_CREATE_SECRET, + &PolicyObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapValidateDbObject returned 0x%08lx\n", Status); + return Status; + } + + /* Open the Secrets object */ + Status = LsapOpenDbObject(PolicyObject, + L"Secrets", + LsaDbContainerObject, + 0, + &SecretsObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapCreateDbObject (Secrets) failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Create the secret object */ + Status = LsapOpenDbObject(SecretsObject, + SecretName->Buffer, + LsaDbSecretObject, + DesiredAccess, + &SecretObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapOpenDbObject (Secret) failed (Status 0x%08lx)\n", Status); + goto done; + } + +done: + if (!NT_SUCCESS(Status)) + { + if (SecretObject != NULL) + LsapCloseDbObject(SecretObject); + } + else + { + *SecretHandle = (LSAPR_HANDLE)SecretObject; + } + + if (SecretsObject != NULL) + LsapCloseDbObject(SecretsObject); + + return STATUS_SUCCESS; } @@ -1147,7 +1319,7 @@ Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, - 0, /* FIXME */ + ACCOUNT_VIEW, &PolicyObject); if (!NT_SUCCESS(Status)) return Status; Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Sat Aug 25 15:40:06 2012 @@ -679,6 +679,7 @@ NTSTATUS NTAPI LsaClose(LSA_HANDLE); NTSTATUS NTAPI LsaConnectUntrusted(PHANDLE); NTSTATUS NTAPI LsaCreateAccount(LSA_HANDLE, PSID, ACCESS_MASK, PLSA_HANDLE); +NTSTATUS NTAPI LsaCreateSecret(LSA_HANDLE, PLSA_UNICODE_STRING, ACCESS_MASK, PLSA_HANDLE); NTSTATUS NTAPI LsaCreateTrustedDomain(LSA_HANDLE, PLSA_TRUST_INFORMATION, ACCESS_MASK, PLSA_HANDLE); NTSTATUS NTAPI LsaCreateTrustedDomainEx(LSA_HANDLE, PTRUSTED_DOMAIN_INFORMATION_EX, @@ -695,6 +696,7 @@ PVOID*,ULONG,PULONG); NTSTATUS NTAPI LsaFreeMemory(PVOID); NTSTATUS NTAPI LsaFreeReturnBuffer(PVOID); +NTSTATUS NTAPI LsaGetSystemAccessAccount(LSA_HANDLE, PULONG); NTSTATUS NTAPI LsaLogonUser(HANDLE,PLSA_STRING,SECURITY_LOGON_TYPE,ULONG,PVOID, ULONG,PTOKEN_GROUPS,PTOKEN_SOURCE,PVOID*,PULONG, PLUID,PHANDLE,PQUOTA_LIMITS,PNTSTATUS); @@ -711,6 +713,7 @@ NTSTATUS NTAPI LsaOpenAccount(LSA_HANDLE, PSID, ACCESS_MASK, PLSA_HANDLE); NTSTATUS NTAPI LsaOpenPolicy(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES, ACCESS_MASK,PLSA_HANDLE); +NTSTATUS NTAPI LsaOpenSecret(LSA_HANDLE, PLSA_UNICODE_STRING, ACCESS_MASK, PLSA_HANDLE); NTSTATUS NTAPI LsaOpenTrustedDomainByName(LSA_HANDLE, PLSA_UNICODE_STRING, ACCESS_MASK, PLSA_HANDLE); NTSTATUS NTAPI LsaQueryDomainInformationPolicy(LSA_HANDLE, @@ -732,6 +735,7 @@ NTSTATUS NTAPI LsaSetInformationPolicy(LSA_HANDLE,POLICY_INFORMATION_CLASS, PVOID); NTSTATUS NTAPI LsaSetLocalInformationPolicy(LSA_HANDLE, POLICY_LOCAL_INFORMATION_CLASS,PVOID); +NTSTATUS NTAPI LsaSetSystemAccessAccount(LSA_HANDLE, ULONG); NTSTATUS NTAPI LsaSetTrustedDomainInformation(LSA_HANDLE,PSID, TRUSTED_INFORMATION_CLASS,PVOID); NTSTATUS NTAPI LsaSetTrustedDomainInfoByName(LSA_HANDLE,PLSA_UNICODE_STRING,

12 years

[tkreuzer] 57157: [GDI32_APITEST] Fix use of uninitialized variables and remove broken test. See issue #7299 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 24 20:25:29 2012 New Revision: 57157 URL: http://svn.reactos.org/svn/reactos?rev=57157&view=rev Log: [GDI32_APITEST] Fix use of uninitialized variables and remove broken test. See issue #7299 for more details. Modified: trunk/rostests/apitests/gdi32/CombineTransform.c Modified: trunk/rostests/apitests/gdi32/CombineTransform.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineTra… ============================================================================== --- trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] Fri Aug 24 20:25:29 2012 @@ -54,14 +54,14 @@ BOOL ret; /* Test NULL paramters */ + set_xform(&xform1, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); + set_xform(&xform2, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); SetLastError(ERROR_SUCCESS); ret = CombineTransform(&xform3, &xform1, NULL); ok_int(ret, 0); ret = CombineTransform(&xform3, NULL, &xform2); ok_int(ret, 0); ret = CombineTransform(NULL, &xform1, &xform2); - ok_int(ret, 0); - ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 0); ok_int(GetLastError(), ERROR_SUCCESS);

12 years

[fireball] 57156: [NTDLL/LDR] - Check result of walking the import descriptor and properly fail in case it wasn't successful. See issue #7289 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Aug 24 17:50:56 2012 New Revision: 57156 URL: http://svn.reactos.org/svn/reactos?rev=57156&view=rev Log: [NTDLL/LDR] - Check result of walking the import descriptor and properly fail in case it wasn't successful. See issue #7289 for more details. Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Fri Aug 24 17:50:56 2012 @@ -1479,7 +1479,7 @@ ULONG HeapFlags; PIMAGE_NT_HEADERS NtHeader; LPWSTR NtDllName = NULL; - NTSTATUS Status; + NTSTATUS Status, ImportStatus; NLSTABLEINFO NlsTable; PIMAGE_LOAD_CONFIG_DIRECTORY LoadConfig; PTEB Teb = NtCurrentTeb(); @@ -1989,7 +1989,7 @@ } /* Walk the IAT and load all the DLLs */ - LdrpWalkImportDescriptor(LdrpDefaultPath.Buffer, LdrpImageEntry); + ImportStatus = LdrpWalkImportDescriptor(LdrpDefaultPath.Buffer, LdrpImageEntry); /* Check if relocation is needed */ if (Peb->ImageBaseAddress != (PVOID)NtHeader->OptionalHeader.ImageBase) @@ -2039,6 +2039,9 @@ /* Phase 0 is done */ LdrpLdrDatabaseIsSetup = TRUE; + + /* Check whether all static imports were properly loaded and return here */ + if (!NT_SUCCESS(ImportStatus)) return ImportStatus; /* Initialize TLS */ Status = LdrpInitializeTls();

12 years

[ion] 57155: [NTOSKRNL]: Cleanup MmCreateArm3Section a little bit to handle file-backed sections in the future. [NTOSKRNL]: Remove an ASSERT(FALSE) that was only there for testing. [NTOSKRNL]: Enab...

by ion＠svn.reactos.org

Author: ion Date: Fri Aug 24 17:17:36 2012 New Revision: 57155 URL: http://svn.reactos.org/svn/reactos?rev=57155&view=rev Log: [NTOSKRNL]: Cleanup MmCreateArm3Section a little bit to handle file-backed sections in the future. [NTOSKRNL]: Remove an ASSERT(FALSE) that was only there for testing. [NTOSKRNL]: Enable richard's ARM3 section code unconditionally for all non-file backed sections. Works4me. Let's see what Testbot says. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Fri Aug 24 17:17:36 2012 @@ -1335,7 +1335,6 @@ } /* Check to see which list this page should go into */ - ASSERT(FALSE); if (Pfn1->u3.e1.Modified == 1) { /* Push it into the modified page list */ 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] Fri Aug 24 17:17:36 2012 @@ -894,10 +894,10 @@ ASSERT(ActualPages <= PageCount); /* Release the working set lock */ -// MiUnlockWorkingSet(PsGetCurrentThread(), +// MiUnlockWorkingSet(PsGetCurrentThread(), // &MmSessionSpace->GlobalVirtualAddress->Vm); - + /* If we did at least one page... */ if (ActualPages) { @@ -974,7 +974,7 @@ { /* Create the PDEs needed for this mapping */ Status = MiSessionCommitPageTables(Base, - (PVOID)((ULONG_PTR)Base + + (PVOID)((ULONG_PTR)Base + Buckets * MI_SYSTEM_VIEW_BUCKET_SIZE)); NT_ASSERT(NT_SUCCESS(Status)); } @@ -1243,6 +1243,37 @@ return STATUS_SUCCESS; } +VOID +NTAPI +MiSubsectionConsistent(IN PSUBSECTION Subsection) +{ + /* ReactOS only supports systems with 4K pages and 4K sectors */ + ASSERT(Subsection->u.SubsectionFlags.SectorEndOffset == 0); + + /* Therefore, then number of PTEs should be equal to the number of sectors */ + if (Subsection->NumberOfFullSectors != Subsection->PtesInSubsection) + { + /* Break and warn if this is inconsistent */ + DPRINT1("Mm: Subsection inconsistent (%x vs %x)\n", + Subsection->NumberOfFullSectors, Subsection->PtesInSubsection); + DbgBreakPoint(); + } +} + +NTSTATUS +NTAPI +MiCreateDataFileMap(IN PFILE_OBJECT File, + OUT PSEGMENT *Segment, + IN PSIZE_T MaximumSize, + IN ULONG SectionPageProtection, + IN ULONG AllocationAttributes, + IN ULONG IgnoreFileSizing) +{ + /* Not yet implemented */ + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS NTAPI MiCreatePagingFileMap(OUT PSEGMENT *Segment, @@ -2048,15 +2079,15 @@ SECTION Section; PSECTION NewSection; PSUBSECTION Subsection; - PSEGMENT NewSegment; + PSEGMENT NewSegment, Segment; NTSTATUS Status; PCONTROL_AREA ControlArea; - ULONG ProtectionMask; - - /* ARM3 does not yet support this */ - ASSERT(FileHandle == NULL); - ASSERT(FileObject == NULL); - ASSERT((AllocationAttributes & SEC_LARGE_PAGES) == 0); + ULONG ProtectionMask, ControlAreaSize, Size, NonPagedCharge, PagedCharge; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + BOOLEAN FileLock = FALSE, KernelCall = FALSE; + KIRQL OldIrql; + PFILE_OBJECT File; + PVOID PreviousSectionPointer; /* Make the same sanity checks that the Nt interface should've validated */ ASSERT((AllocationAttributes & ~(SEC_COMMIT | SEC_RESERVE | SEC_BASED | @@ -2079,53 +2110,229 @@ ProtectionMask = MiMakeProtectionMask(SectionPageProtection); if (ProtectionMask == MM_INVALID_PROTECTION) return STATUS_INVALID_PAGE_PROTECTION; - /* A handle must be supplied with SEC_IMAGE, and this is the no-handle path */ - if (AllocationAttributes & SEC_IMAGE) return STATUS_INVALID_FILE_FOR_SECTION; - - /* So this must be a pagefile-backed section, create the mappings needed */ - Status = MiCreatePagingFileMap(&NewSegment, - (PSIZE_T)InputMaximumSize, - ProtectionMask, - AllocationAttributes); - ASSERT(NT_SUCCESS(Status)); - ASSERT(NewSegment != NULL); + /* Check if this is going to be a data or image backed file section */ + if ((FileHandle) || (FileObject)) + { + /* These cannot be mapped with large pages */ + if (AllocationAttributes & SEC_LARGE_PAGES) return STATUS_INVALID_PARAMETER_6; + + /* For now, only support the mechanism through a file handle */ + ASSERT(FileObject == NULL); + + /* Reference the file handle to get the object */ + Status = ObReferenceObjectByHandle(FileHandle, + MmMakeFileAccess[ProtectionMask], + IoFileObjectType, + PreviousMode, + (PVOID*)&File, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Make sure Cc has been doing its job */ + if (!File->SectionObjectPointer) + { + /* This is not a valid file system-based file, fail */ + ObDereferenceObject(File); + return STATUS_INVALID_FILE_FOR_SECTION; + } + + /* Image-file backed sections are not yet supported */ + ASSERT((AllocationAttributes & SEC_IMAGE) == 0); + + /* Compute the size of the control area, and allocate it */ + ControlAreaSize = sizeof(CONTROL_AREA) + sizeof(MSUBSECTION); + ControlArea = ExAllocatePoolWithTag(NonPagedPool, ControlAreaSize, 'aCmM'); + if (!ControlArea) + { + ObDereferenceObject(File); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Zero it out */ + RtlZeroMemory(ControlArea, ControlAreaSize); + + /* Did we get a handle, or an object? */ + if (FileHandle) + { + /* We got a file handle so we have to lock down the file */ +#if 0 + Status = FsRtlAcquireToCreateMappedSection(File, SectionPageProtection); + if (!NT_SUCCESS(Status)) + { + ExFreePool(ControlArea); + ObDereferenceObject(File); + return Status; + } +#else + /* ReactOS doesn't support this API yet, so do nothing */ + Status = STATUS_SUCCESS; +#endif + /* Update the top-level IRP so that drivers know what's happening */ + IoSetTopLevelIrp((PIRP)FSRTL_FSP_TOP_LEVEL_IRP); + FileLock = TRUE; + } + + /* Lock the PFN database while we play with the section pointers */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Image-file backed sections are not yet supported */ + ASSERT((AllocationAttributes & SEC_IMAGE) == 0); + + /* There should not already be a control area for this file */ + ASSERT(File->SectionObjectPointer->DataSectionObject == NULL); + NewSegment = NULL; + + /* Write down that this CA is being created, and set it */ + ControlArea->u.Flags.BeingCreated = TRUE; + PreviousSectionPointer = File->SectionObjectPointer; + File->SectionObjectPointer->DataSectionObject = ControlArea; + + /* We can release the PFN lock now */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + /* We don't support previously-mapped file */ + ASSERT(NewSegment == NULL); + + /* Image-file backed sections are not yet supported */ + ASSERT((AllocationAttributes & SEC_IMAGE) == 0); + + /* So we always create a data file map */ + Status = MiCreateDataFileMap(File, + &Segment, + (PSIZE_T)InputMaximumSize, + SectionPageProtection, + AllocationAttributes, + KernelCall); + ASSERT(PreviousSectionPointer == File->SectionObjectPointer); + ASSERT(NT_SUCCESS(Status)); + + /* Check if a maximum size was specified */ + if (!InputMaximumSize->QuadPart) + { + /* Nope, use the segment size */ + Section.SizeOfSection.QuadPart = (LONGLONG)Segment->SizeOfSegment; + } + else + { + /* Yep, use the entered size */ + Section.SizeOfSection.QuadPart = InputMaximumSize->QuadPart; + } + + } + else + { + /* A handle must be supplied with SEC_IMAGE, as this is the no-handle path */ + if (AllocationAttributes & SEC_IMAGE) return STATUS_INVALID_FILE_FOR_SECTION; + + /* Not yet supported */ + ASSERT((AllocationAttributes & SEC_LARGE_PAGES) == 0); + + /* So this must be a pagefile-backed section, create the mappings needed */ + Status = MiCreatePagingFileMap(&NewSegment, + (PSIZE_T)InputMaximumSize, + ProtectionMask, + AllocationAttributes); + ASSERT(NT_SUCCESS(Status)); + + /* Set the size here, and read the control area */ + Section.SizeOfSection.QuadPart = NewSegment->SizeOfSegment; + ControlArea = NewSegment->ControlArea; + } + + /* Did we already have a segment? */ + if (!NewSegment) + { + /* This must be the file path and we created a segment */ + NewSegment = Segment; + ASSERT(File != NULL); + + /* Acquire the PFN lock while we set control area flags */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* We don't support this race condition yet, so assume no waiters */ + ASSERT(ControlArea->WaitingForDeletion == NULL); + ControlArea->WaitingForDeletion = NULL; + + /* Image-file backed sections are not yet supported, nor ROM images */ + ASSERT((AllocationAttributes & SEC_IMAGE) == 0); + ASSERT(Segment->ControlArea->u.Flags.Rom == 0); + + /* Take off the being created flag, and then release the lock */ + ControlArea->u.Flags.BeingCreated = FALSE; + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } + + /* Check if we locked the file earlier */ + if (FileLock) + { + /* Reset the top-level IRP and release the lock */ + IoSetTopLevelIrp(NULL); + //FsRtlReleaseFile(File); + FileLock = FALSE; + } /* Set the initial section object data */ Section.InitialPageProtection = SectionPageProtection; - Section.SizeOfSection.QuadPart = NewSegment->SizeOfSegment; + + /* The mapping created a control area and segment, save the flags */ Section.Segment = NewSegment; - - /* THe mapping created a control area and segment, save the flags */ - ControlArea = NewSegment->ControlArea; Section.u.LongFlags = ControlArea->u.LongFlags; - /* ARM3 cannot support these right now, make sure they're not being set */ - ASSERT(ControlArea->u.Flags.Image == 0); - ASSERT(ControlArea->FilePointer == NULL); + /* Check if this is a user-mode read-write non-image file mapping */ + if (!(FileObject) && + (SectionPageProtection & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE)) && + (ControlArea->u.Flags.Image == 0) && + (ControlArea->FilePointer != NULL)) + { + /* Add a reference and set the flag */ + Section.u.Flags.UserWritable = 1; + InterlockedIncrement((PLONG)&ControlArea->WritableUserReferences); + } + + /* Check for image mappings or page file mappings */ + if ((ControlArea->u.Flags.Image == 1) || !(ControlArea->FilePointer)) + { + /* Charge the segment size, and allocate a subsection */ + PagedCharge = sizeof(SECTION) + NewSegment->TotalNumberOfPtes * sizeof(MMPTE); + Size = sizeof(SUBSECTION); + } + else + { + /* Charge nothing, and allocate a mapped subsection */ + PagedCharge = 0; + Size = sizeof(MSUBSECTION); + } + + /* Check if this is a normal CA */ ASSERT(ControlArea->u.Flags.GlobalOnlyPerSession == 0); ASSERT(ControlArea->u.Flags.Rom == 0); - ASSERT(ControlArea->u.Flags.WasPurged == 0); - - /* A pagefile-backed mapping only has one subsection, and this is all ARM3 supports */ + + /* Charge only a CA, and the subsection is right after */ + NonPagedCharge = sizeof(CONTROL_AREA); Subsection = (PSUBSECTION)(ControlArea + 1); + + /* We only support single-subsection mappings */ + NonPagedCharge += Size; ASSERT(Subsection->NextSubsection == NULL); /* Create the actual section object, with enough space for the prototype PTEs */ - Status = ObCreateObject(ExGetPreviousMode(), + Status = ObCreateObject(PreviousMode, MmSectionObjectType, ObjectAttributes, - ExGetPreviousMode(), + PreviousMode, NULL, sizeof(SECTION), - sizeof(SECTION) + - NewSegment->TotalNumberOfPtes * sizeof(MMPTE), - sizeof(CONTROL_AREA) + sizeof(SUBSECTION), + PagedCharge, + NonPagedCharge, (PVOID*)&NewSection); ASSERT(NT_SUCCESS(Status)); /* Now copy the local section object from the stack into this new object */ RtlCopyMemory(NewSection, &Section, sizeof(SECTION)); NewSection->Address.StartingVpn = 0; + + /* For now, only user calls are supported */ + ASSERT(KernelCall == FALSE); NewSection->u.Flags.UserReference = TRUE; /* Migrate the attribute into a flag */ @@ -2170,6 +2377,13 @@ /* Finally release the lock */ KeReleaseGuardedMutex(&MmSectionBasedMutex); } + + /* Write down if this was a kernel call */ + ControlArea->u.Flags.WasPurged |= KernelCall; + ASSERT(ControlArea->u.Flags.WasPurged == FALSE); + + /* Make sure the segment and the section are the same size, or the section is smaller */ + ASSERT(NewSection->SizeOfSection.QuadPart <= NewSection->Segment->SizeOfSegment); /* Return the object and the creation status */ *SectionObject = (PVOID)NewSection; 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] Fri Aug 24 17:17:36 2012 @@ -4860,17 +4860,19 @@ PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; /* Check if an ARM3 section is being created instead */ - if (AllocationAttributes & 1) + if (!(AllocationAttributes & SEC_IMAGE) && (AllocationAttributes)) { - DPRINT1("Creating ARM3 section\n"); - return MmCreateArm3Section(Section, - DesiredAccess, - ObjectAttributes, - MaximumSize, - SectionPageProtection, - AllocationAttributes &~ 1, - FileHandle, - FileObject); + if (!(FileObject) && !(FileHandle)) + { + return MmCreateArm3Section(Section, + DesiredAccess, + ObjectAttributes, + MaximumSize, + SectionPageProtection, + AllocationAttributes &~ 1, + FileHandle, + FileObject); + } } /*

12 years

[jgardou] 57154: [CMAKE] - Fix build, sorry

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Aug 24 16:29:37 2012 New Revision: 57154 URL: http://svn.reactos.org/svn/reactos?rev=57154&view=rev Log: [CMAKE] - Fix build, sorry Modified: trunk/reactos/dll/opengl/CMakeLists.txt trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/dll/opengl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/CMakeLists.txt?… ============================================================================== --- trunk/reactos/dll/opengl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/CMakeLists.txt [iso-8859-1] Fri Aug 24 16:29:37 2012 @@ -1,1 +1,2 @@ -add_subdirectory(mesa) +add_subdirectory(mesa) +add_subdirectory(opengl32) 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] Fri Aug 24 16:29:37 2012 @@ -134,7 +134,6 @@ add_subdirectory(olepro32) add_subdirectory(olesvr32) add_subdirectory(olethk32) -add_subdirectory(opengl32) add_subdirectory(pdh) add_subdirectory(pidgen) add_subdirectory(powrprof)

12 years

[jgardou] 57153: [OPENGL] - Add some optimizations (GCC) on compilation of libMesa - Move opengl32 to the opengl directory - Disable ICD refcounting for now, it does more harm than good.

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Aug 24 16:28:09 2012 New Revision: 57153 URL: http://svn.reactos.org/svn/reactos?rev=57153&view=rev Log: [OPENGL] - Add some optimizations (GCC) on compilation of libMesa - Move opengl32 to the opengl directory - Disable ICD refcounting for now, it does more harm than good. Added: trunk/reactos/dll/opengl/opengl32/ - copied from r57143, trunk/reactos/dll/win32/opengl32/ Removed: trunk/reactos/dll/win32/opengl32/ Modified: trunk/reactos/dll/opengl/mesa/CMakeLists.txt trunk/reactos/dll/opengl/opengl32/wgl.c Modified: trunk/reactos/dll/opengl/mesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/CMakeLists… ============================================================================== --- trunk/reactos/dll/opengl/mesa/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/CMakeLists.txt [iso-8859-1] Fri Aug 24 16:28:09 2012 @@ -14,6 +14,8 @@ if(NOT MSVC) add_compile_flags_language("-std=gnu99" "C") add_compile_flags("-Wno-deprecated-declarations") + # optimizations (builtin memcmp is slow on some gcc versions) used in SConsript files + add_compile_flags("-ffast-math -fno-builtin-memcmp") else() include_directories(include/c99) add_compile_flags("/wd4996") Modified: trunk/reactos/dll/opengl/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/wgl.c?… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/wgl.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/wgl.c [iso-8859-1] Fri Aug 24 16:28:09 2012 @@ -129,6 +129,8 @@ ROSGL_DeleteDCDataForICD( GLDRIVERDATA *icd ) { GLDCDATA *p, **pptr; + + return; /* synchronize */ if (WaitForSingleObject( OPENGL32_processdata.dcdata_mutex, INFINITE ) ==

12 years

[akhaldi] 57152: [CMAKE/MSVC] * Call cl directly instead of its full path using <CMAKE_C_COMPILER>. Figuring out why it didn't work is left as an exercise for the reader.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Aug 24 16:21:33 2012 New Revision: 57152 URL: http://svn.reactos.org/svn/reactos?rev=57152&view=rev Log: [CMAKE/MSVC] * Call cl directly instead of its full path using <CMAKE_C_COMPILER>. Figuring out why it didn't work is left as an exercise for the reader. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=57152… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Fri Aug 24 16:21:33 2012 @@ -53,12 +53,12 @@ # We may temporarily use just the global defines, but this is not a solution as some modules (minihal for example) apply additional definitions to source files, so we get an incorrect build of such targets. get_directory_property(definitions DEFINITIONS) set(CMAKE_ASM_COMPILE_OBJECT - "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> ${definitions} /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" + "cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> ${definitions} /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") else() # NMake Makefiles set(CMAKE_ASM_COMPILE_OBJECT - "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" + "cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") endif()

12 years

[akhaldi] 57151: [CMAKE/MSVC] Hermès Bélusca: * Fix a bug in the way we compiled the boot sectors on the x64 build. * Consistently set the mc compiler, like gcc builds. * Use proper variables when ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Aug 24 15:36:17 2012 New Revision: 57151 URL: http://svn.reactos.org/svn/reactos?rev=57151&view=rev Log: [CMAKE/MSVC] Hermès Bélusca: * Fix a bug in the way we compiled the boot sectors on the x64 build. * Consistently set the mc compiler, like gcc builds. * Use proper variables when referring to the compilers. See issue #7297 for more details. Modified: trunk/reactos/cmake/msvc.cmake trunk/reactos/toolchain-msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=57151… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Fri Aug 24 15:36:17 2012 @@ -53,12 +53,12 @@ # We may temporarily use just the global defines, but this is not a solution as some modules (minihal for example) apply additional definitions to source files, so we get an incorrect build of such targets. get_directory_property(definitions DEFINITIONS) set(CMAKE_ASM_COMPILE_OBJECT - "cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> ${definitions} /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" + "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> ${definitions} /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") else() # NMake Makefiles set(CMAKE_ASM_COMPILE_OBJECT - "cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" + "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") endif() @@ -67,14 +67,14 @@ add_compile_flags("/analyze") elseif(_PREFAST_) message("PREFAST enabled!") - set(CMAKE_C_COMPILE_OBJECT "prefast cl ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} <FLAGS> <DEFINES> /Fo<OBJECT> -c <SOURCE>${CMAKE_END_TEMP_FILE}" + set(CMAKE_C_COMPILE_OBJECT "prefast <CMAKE_C_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} <FLAGS> <DEFINES> /Fo<OBJECT> -c <SOURCE>${CMAKE_END_TEMP_FILE}" "prefast LIST") - set(CMAKE_CXX_COMPILE_OBJECT "prefast cl ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} <FLAGS> <DEFINES> /TP /Fo<OBJECT> -c <SOURCE>${CMAKE_END_TEMP_FILE}" + set(CMAKE_CXX_COMPILE_OBJECT "prefast <CMAKE_CXX_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} <FLAGS> <DEFINES> /TP /Fo<OBJECT> -c <SOURCE>${CMAKE_END_TEMP_FILE}" "prefast LIST") set(CMAKE_C_LINK_EXECUTABLE - "cl ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> -link /implib:<TARGET_IMPLIB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}") + "<CMAKE_C_COMPILER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> -link /implib:<TARGET_IMPLIB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}") set(CMAKE_CXX_LINK_EXECUTABLE - "cl ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> -link /implib:<TARGET_IMPLIB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}") + "<CMAKE_CXX_COMPILER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> -link /implib:<TARGET_IMPLIB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}") endif() set(CMAKE_RC_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY}) @@ -143,7 +143,7 @@ # Compile the generated asm stub file add_custom_command( OUTPUT ${_asm_stubs_file}.obj - COMMAND ml /Cp /Fo${_asm_stubs_file}.obj /c /Ta ${_asm_stubs_file} + COMMAND ${CMAKE_ASM_COMPILER} /Cp /Fo${_asm_stubs_file}.obj /c /Ta ${_asm_stubs_file} DEPENDS ${_asm_stubs_file}) else() # be clear about the "language" @@ -202,27 +202,28 @@ endfunction() macro(macro_mc FLAG FILE) - set(COMMAND_MC mc ${FLAG} -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc) + set(COMMAND_MC ${CMAKE_MC_COMPILER} ${FLAG} -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc) endmacro() #pseh workaround set(PSEH_LIB "pseh") -# Use full path for ml when using x64 VS -if((ARCH MATCHES amd64) AND ($ENV{VCINSTALLDIR})) +# Use a full path for the x86 version of ml when using x64 VS. +# It's not a problem when using the DDK/WDK because, in x64 mode, +# both the x86 and x64 versions of ml are available. +if((ARCH MATCHES amd64) AND (DEFINED ENV{VCINSTALLDIR})) set(CMAKE_ASM16_COMPILER $ENV{VCINSTALLDIR}/bin/ml.exe) else() set(CMAKE_ASM16_COMPILER ml.exe) endif() function(CreateBootSectorTarget _target_name _asm_file _binary_file _base_address) - set(_object_file ${_binary_file}.obj) set(_temp_file ${_binary_file}.tmp) add_custom_command( OUTPUT ${_temp_file} - COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file} + COMMAND ${CMAKE_C_COMPILER} /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file} DEPENDS ${_asm_file}) add_custom_command( Modified: trunk/reactos/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-msvc.cmake?rev=5… ============================================================================== --- trunk/reactos/toolchain-msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-msvc.cmake [iso-8859-1] Fri Aug 24 15:36:17 2012 @@ -6,6 +6,7 @@ # which compilers to use for C and C++ set(CMAKE_C_COMPILER cl) set(CMAKE_CXX_COMPILER cl) +set(CMAKE_MC_COMPILER mc) set(CMAKE_RC_COMPILER rc) if(${ARCH} MATCHES amd64) set(CMAKE_ASM_COMPILER ml64)

12 years

[tfaber] 57150: [ADVAPI32] - Correctly handle NULL passwords for services. Patch by Hermès Bélusca. Fixes crash in advapi32_winetest:service. See bug 7239, bug 7293.

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Aug 24 12:52:29 2012 New Revision: 57150 URL: http://svn.reactos.org/svn/reactos?rev=57150&view=rev Log: [ADVAPI32] - Correctly handle NULL passwords for services. Patch by Hermès Bélusca. Fixes crash in advapi32_winetest:service. See bug 7239, bug 7293. Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Fri Aug 24 12:52:29 2012 @@ -309,7 +309,7 @@ /* FIXME: Encrypt the password */ lpEncryptedPassword = (LPBYTE)lpPassword; - dwPasswordLength = (strlen(lpPassword) + 1) * sizeof(CHAR); + dwPasswordLength = (lpPassword ? (strlen(lpPassword) + 1) * sizeof(CHAR) : 0); RpcTryExcept { @@ -387,7 +387,7 @@ /* FIXME: Encrypt the password */ lpEncryptedPassword = (LPBYTE)lpPassword; - dwPasswordLength = (wcslen(lpPassword) + 1) * sizeof(WCHAR); + dwPasswordLength = (lpPassword ? (wcslen(lpPassword) + 1) * sizeof(WCHAR) : 0); RpcTryExcept { @@ -577,7 +577,7 @@ /* FIXME: Encrypt the password */ lpEncryptedPassword = (LPBYTE)lpPassword; - dwPasswordLength = (strlen(lpPassword) + 1) * sizeof(CHAR); + dwPasswordLength = (lpPassword ? (strlen(lpPassword) + 1) * sizeof(CHAR) : 0); RpcTryExcept { @@ -671,7 +671,7 @@ /* FIXME: Encrypt the password */ lpEncryptedPassword = (LPBYTE)lpPassword; - dwPasswordLength = (wcslen(lpPassword) + 1) * sizeof(WCHAR); + dwPasswordLength = (lpPassword ? (wcslen(lpPassword) + 1) * sizeof(WCHAR) : 0); RpcTryExcept {

12 years

[cgutman] 57149: [MSAFD] - Stubplement support for SIOCATMARK [WSHTCPIP] - Add better debugging for unsupported options - Implement setting SO_DONTROUTE (nop) - Return WSAENOPROTOOPT for invalid SO...

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 24 06:23:45 2012 New Revision: 57149 URL: http://svn.reactos.org/svn/reactos?rev=57149&view=rev Log: [MSAFD] - Stubplement support for SIOCATMARK [WSHTCPIP] - Add better debugging for unsupported options - Implement setting SO_DONTROUTE (nop) - Return WSAENOPROTOOPT for invalid SOL_SOCKET options Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/wshtcpip/wshtcpip.c trunk/reactos/dll/win32/wshtcpip/wshtcpip.h Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Fri Aug 24 06:23:45 2012 @@ -2017,6 +2017,19 @@ *lpcbBytesReturned = sizeof(ULONG); return NO_ERROR; } + case SIOCATMARK: + if (cbOutBuffer < sizeof(BOOL) || IS_INTRESOURCE(lpvOutBuffer)) + { + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + + /* FIXME: Return false for now */ + *(BOOL*)lpvOutBuffer = FALSE; + + *lpcbBytesReturned = sizeof(BOOL); + *lpErrno = NO_ERROR; + return NO_ERROR; case SIO_GET_EXTENSION_FUNCTION_POINTER: *lpErrno = WSAEINVAL; return SOCKET_ERROR; Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshtcpip/wshtcpi… ============================================================================== --- trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] Fri Aug 24 06:23:45 2012 @@ -161,6 +161,18 @@ { switch (Level) { + case SOL_SOCKET: + switch (OptionName) + { + case SO_KEEPALIVE: + /* FIXME: Return proper option */ + ASSERT(FALSE); + break; + default: + break; + } + break; + case IPPROTO_IP: switch (OptionName) { @@ -179,19 +191,26 @@ return AO_OPTION_IP_HDRINCL; default: - DPRINT1("Unknown option name for IPPROTO_IP: %d\n", OptionName); - return 0; + break; } break; - case SOL_SOCKET: - DPRINT1("SOL_SOCKET option %d\n", OptionName); + case IPPROTO_TCP: + switch (OptionName) + { + case TCP_NODELAY: + /* FIXME: Return proper option */ + ASSERT(FALSE); + break; + default: + break; + } + + default: break; - - default: - DPRINT1("Unknown level: %d\n", Level); - break; - } + } + + DPRINT1("Unknown level/option name: %d %d\n", Level, OptionName); return 0; } @@ -208,6 +227,10 @@ OUT LPINT OptionLength) { UNIMPLEMENTED + + DPRINT1("Get: Unknown level/option name: %d %d\n", Level, OptionName); + + *OptionLength = 0; return NO_ERROR; } @@ -317,6 +340,8 @@ OUT LPBOOL NeedsCompletion) { UNIMPLEMENTED + + DPRINT1("Ioctl: Unknown IOCTL code: %d\n", IoControlCode); return NO_ERROR; } @@ -626,11 +651,71 @@ /* FIXME: We only handle address file object here */ + switch (Level) + { + case SOL_SOCKET: + switch (OptionName) + { + case SO_DONTROUTE: + if (OptionLength < sizeof(BOOL)) + { + return WSAEFAULT; + } + Context->DontRoute = *(BOOL*)OptionValue; + /* This is silently ignored on Windows */ + return 0; + + case SO_KEEPALIVE: + /* FIXME -- We'll send this to TCPIP */ + DPRINT1("Set: SO_KEEPALIVE not yet supported\n"); + return 0; + + default: + /* Invalid option */ + DPRINT1("Set: Received unexpected SOL_SOCKET option %d\n", OptionName); + return WSAENOPROTOOPT; + } + break; + + case IPPROTO_IP: + switch (OptionName) + { + case IP_TTL: + case IP_DONTFRAGMENT: + case IP_HDRINCL: + /* Send these to TCPIP */ + break; + + default: + /* Invalid option -- FIXME */ + DPRINT1("Set: Received unsupported IPPROTO_IP option %d\n", OptionName); + return 0; + } + break; + + case IPPROTO_TCP: + switch (OptionName) + { + case TCP_NODELAY: + /* FIXME -- Send this to TCPIP */ + DPRINT1("Set: TCP_NODELAY not yet supported\n"); + return 0; + + default: + /* Invalid option */ + DPRINT1("Set: Received unexpected IPPROTO_TCP option %d\n", OptionName); + return 0; + } + break; + + default: + DPRINT1("Set: Received unexpected %d option %d\n", Level, OptionName); + return 0; + } + + /* If we get here, GetAddressOption must return something valid */ RealOptionName = GetAddressOption(Level, OptionName); - - /* FIXME: Support all options */ - if (!RealOptionName) - return 0; /* return WSAEINVAL; */ + ASSERT(RealOptionName != 0); Info = HeapAlloc(GetProcessHeap(), 0, sizeof(*Info) + OptionLength); if (!Info) Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshtcpip/wshtcpi… ============================================================================== --- trunk/reactos/dll/win32/wshtcpip/wshtcpip.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshtcpip/wshtcpip.h [iso-8859-1] Fri Aug 24 06:23:45 2012 @@ -42,6 +42,7 @@ DWORD AddrFileInstance; SOCKET_STATE SocketState; PQUEUED_REQUEST RequestQueue; + BOOL DontRoute; } SOCKET_CONTEXT, *PSOCKET_CONTEXT; #endif /* __WSHTCPIP_H */

12 years

← Newer
1
2
3
4
5
6
7
8
9
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2012