Ros-diffs November 2016

ros-diffs@reactos.org

15 participants
317 discussions

[hbelusca] 73330: [LSASRV]: Implement a simplified version of LsaIAllocateHeap / LsaIAllocateHeapZero / LsaIFreeHeap. CORE-12432

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 20 23:53:49 2016 New Revision: 73330 URL: http://svn.reactos.org/svn/reactos?rev=73330&view=rev Log: [LSASRV]: Implement a simplified version of LsaIAllocateHeap / LsaIAllocateHeapZero / LsaIFreeHeap. CORE-12432 Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/lsasrv/lsasrv.spec Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Sun Nov 20 23:53:49 2016 @@ -360,25 +360,27 @@ } -static PVOID NTAPI LsapAllocateHeap(IN ULONG Length) { - return RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - Length); -} - - -static + return RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); +} + + +PVOID +NTAPI +LsapAllocateHeapZero(IN ULONG Length) +{ + return RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Length); +} + + VOID NTAPI LsapFreeHeap(IN PVOID Base) { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - Base); + RtlFreeHeap(RtlGetProcessHeap(), 0, Base); } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.sp… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] Sun Nov 20 23:53:49 2016 @@ -4,8 +4,8 @@ @ stub DsRolerGetDcOperationProgress @ stub DsRolerGetDcOperationResults @ stub LsaIAddNameToLogonSession -@ stub LsaIAllocateHeap -@ stub LsaIAllocateHeapZero +@ stdcall LsaIAllocateHeap(long) LsapAllocateHeap +@ stdcall LsaIAllocateHeapZero(long) LsapAllocateHeapZero @ stub LsaIAuditAccountLogon @ stub LsaIAuditAccountLogonEx @ stub LsaIAuditKdcEvent @@ -27,7 +27,7 @@ @ stub LsaIFilterSids @ stub LsaIForestTrustFindMatch @ stub LsaIFreeForestTrustInfo -@ stub LsaIFreeHeap +@ stdcall LsaIFreeHeap(ptr) LsapFreeHeap @ stub LsaIFreeReturnBuffer @ stub LsaIFree_LSAI_PRIVATE_DATA #DATA @ stub LsaIFree_LSAI_SECRET_ENUM_BUFFER

7 years, 11 months

[hbelusca] 73329: [LSASRV]: Whitespace fixes only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 20 23:53:10 2016 New Revision: 73329 URL: http://svn.reactos.org/svn/reactos?rev=73329&view=rev Log: [LSASRV]: Whitespace fixes only. Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.sp… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] Sun Nov 20 23:53:10 2016 @@ -1,147 +1,147 @@ - @ stub DsRolerDcAsDc - @ stub DsRolerDcAsReplica - @ stub DsRolerDemoteDc - @ stub DsRolerGetDcOperationProgress - @ stub DsRolerGetDcOperationResults - @ stub LsaIAddNameToLogonSession - @ stub LsaIAllocateHeap - @ stub LsaIAllocateHeapZero - @ stub LsaIAuditAccountLogon - @ stub LsaIAuditAccountLogonEx - @ stub LsaIAuditKdcEvent - @ stub LsaIAuditKerberosLogon - @ stub LsaIAuditLogonUsingExplicitCreds - @ stub LsaIAuditNotifyPackageLoad - @ stub LsaIAuditPasswordAccessEvent - @ stub LsaIAuditSamEvent - @ stub LsaICallPackage - @ stub LsaICallPackageEx - @ stub LsaICallPackagePassthrough - @ stub LsaICancelNotification - @ stub LsaIChangeSecretCipherKey - @ stub LsaICryptProtectData - @ stub LsaICryptUnprotectData - @ stub LsaIDsNotifiedObjectChange - @ stub LsaIEnumerateSecrets - @ stub LsaIEventNotify - @ stub LsaIFilterSids - @ stub LsaIForestTrustFindMatch - @ stub LsaIFreeForestTrustInfo - @ stub LsaIFreeHeap - @ stub LsaIFreeReturnBuffer - @ stub LsaIFree_LSAI_PRIVATE_DATA #DATA - @ stub LsaIFree_LSAI_SECRET_ENUM_BUFFER - @ stdcall LsaIFree_LSAPR_ACCOUNT_ENUM_BUFFER(ptr) - @ stdcall LsaIFree_LSAPR_CR_CIPHER_VALUE(ptr) - @ stub LsaIFree_LSAPR_POLICY_DOMAIN_INFORMATION - @ stdcall LsaIFree_LSAPR_POLICY_INFORMATION(long ptr) - @ stdcall LsaIFree_LSAPR_PRIVILEGE_ENUM_BUFFER(ptr) - @ stdcall LsaIFree_LSAPR_PRIVILEGE_SET(ptr) - @ stdcall LsaIFree_LSAPR_REFERENCED_DOMAIN_LIST(ptr) - @ stdcall LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR(ptr) - @ stdcall LsaIFree_LSAPR_TRANSLATED_NAMES(ptr) - @ stdcall LsaIFree_LSAPR_TRANSLATED_SIDS(ptr) - @ stub LsaIFree_LSAPR_TRUSTED_DOMAIN_INFO - @ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER - @ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER_EX - @ stub LsaIFree_LSAPR_TRUST_INFORMATION - @ stub LsaIFree_LSAPR_UNICODE_STRING - @ stub LsaIFree_LSAPR_UNICODE_STRING_BUFFER - @ stub LsaIFree_LSAP_SITENAME_INFO - @ stub LsaIFree_LSAP_SITE_INFO - @ stub LsaIFree_LSAP_SUBNET_INFO - @ stub LsaIFree_LSAP_UPN_SUFFIXES - @ stub LsaIFree_LSA_FOREST_TRUST_COLLISION_INFORMATION - @ stub LsaIFree_LSA_FOREST_TRUST_INFORMATION - @ stub LsaIGetBootOption - @ stub LsaIGetCallInfo - @ stub LsaIGetForestTrustInformation - @ stub LsaIGetLogonGuid - @ stub LsaIGetNbAndDnsDomainNames - @ stub LsaIGetPrivateData - @ stub LsaIGetSerialNumberPolicy - @ stub LsaIGetSerialNumberPolicy2 - @ stub LsaIGetSiteName - @ stub LsaIHealthCheck - @ stub LsaIImpersonateClient - @ stub LsaIInitializeWellKnownSids - @ stub LsaIIsClassIdLsaClass - @ stub LsaIIsDsPaused - @ stub LsaIKerberosRegisterTrustNotification - @ stub LsaILookupWellKnownName - @ stub LsaINotifyChangeNotification - @ stub LsaINotifyNetlogonParametersChangeW - @ stub LsaINotifyPasswordChanged - @ stdcall LsaIOpenPolicyTrusted(ptr) - @ stub LsaIQueryForestTrustInfo - @ stub LsaIQueryInformationPolicyTrusted - @ stub LsaIQuerySiteInfo - @ stub LsaIQuerySubnetInfo - @ stub LsaIQueryUpnSuffixes - @ stub LsaIRegisterNotification - @ stub LsaIRegisterPolicyChangeNotificationCallback - @ stub LsaISafeMode - @ stub LsaISamIndicatedDsStarted - @ stub LsaISetBootOption - @ stub LsaISetClientDnsHostName - @ stub LsaISetLogonGuidInLogonSession - @ stub LsaISetPrivateData - @ stub LsaISetSerialNumberPolicy - @ stub LsaISetTimesSecret - @ stub LsaISetupWasRun - @ stub LsaITestCall - @ stub LsaIUnregisterAllPolicyChangeNotificationCallback - @ stub LsaIUnregisterPolicyChangeNotificationCallback - @ stub LsaIUpdateForestTrustInformation - @ stub LsaIWriteAuditEvent - @ stub LsapAuOpenSam - @ stub LsapCheckBootMode - @ stub LsapDsDebugInitialize - @ stub LsapDsInitializeDsStateInfo - @ stub LsapDsInitializePromoteInterface - @ stdcall LsapInitLsa() - @ stdcall LsarAddPrivilegesToAccount(ptr ptr) - @ stdcall LsarClose(ptr) - @ stdcall LsarCreateAccount(ptr ptr long ptr) - @ stdcall LsarCreateSecret(ptr ptr long ptr) - @ stdcall LsarCreateTrustedDomain(ptr ptr long ptr) - @ stdcall LsarCreateTrustedDomainEx(ptr ptr ptr long ptr) - @ stdcall LsarDelete(ptr) - @ stdcall LsarEnumerateAccounts(ptr ptr ptr long) - @ stdcall LsarEnumeratePrivileges(ptr ptr ptr long) - @ stdcall LsarEnumeratePrivilegesAccount(ptr ptr) - @ stdcall LsarEnumerateTrustedDomains(ptr ptr ptr long) - @ stdcall LsarEnumerateTrustedDomainsEx(ptr long ptr long) - @ stdcall LsarGetQuotasForAccount(ptr ptr) - @ stdcall LsarGetSystemAccessAccount(ptr ptr) - @ stdcall LsarLookupNames(ptr long ptr ptr ptr long ptr) - @ stdcall LsarLookupPrivilegeDisplayName(ptr ptr long long ptr ptr) - @ stdcall LsarLookupPrivilegeName(ptr ptr ptr) - @ stdcall LsarLookupPrivilegeValue(ptr ptr ptr) - @ stdcall LsarLookupSids(ptr ptr ptr ptr long ptr) - @ stdcall LsarLookupSids2(ptr ptr ptr ptr long long long long) - @ stdcall LsarOpenAccount(ptr ptr long ptr) - @ stdcall LsarOpenPolicy(ptr ptr long ptr) - @ stdcall LsarOpenPolicySce(ptr ptr long ptr) - @ stdcall LsarOpenSecret(ptr ptr long ptr) - @ stdcall LsarOpenTrustedDomain(ptr ptr long ptr) - @ stdcall LsarOpenTrustedDomainByName(ptr ptr long ptr) - @ stdcall LsarQueryDomainInformationPolicy(ptr long ptr) - @ stdcall LsarQueryForestTrustInformation(ptr ptr long ptr) - @ stdcall LsarQueryInfoTrustedDomain(ptr long ptr) - @ stdcall LsarQueryInformationPolicy(ptr long ptr) - @ stdcall LsarQuerySecret(ptr ptr ptr ptr ptr) - @ stdcall LsarQuerySecurityObject(ptr long ptr) - @ stdcall LsarQueryTrustedDomainInfo(ptr ptr long ptr) - @ stdcall LsarQueryTrustedDomainInfoByName(ptr ptr long ptr) - @ stdcall LsarRemovePrivilegesFromAccount(ptr long ptr) - @ stdcall LsarSetDomainInformationPolicy(ptr long long) - @ stdcall LsarSetForestTrustInformation(ptr ptr long ptr long ptr) - @ stdcall LsarSetInformationPolicy(ptr long ptr) - @ stdcall LsarSetInformationTrustedDomain(ptr long ptr) - @ stdcall LsarSetQuotasForAccount(ptr ptr) - @ stdcall LsarSetSecret(ptr ptr ptr) - @ stdcall LsarSetSecurityObject(ptr long ptr) - @ stdcall LsarSetSystemAccessAccount(ptr long) - @ stdcall LsarSetTrustedDomainInfoByName(ptr ptr long long) - @ stdcall ServiceInit() +@ stub DsRolerDcAsDc +@ stub DsRolerDcAsReplica +@ stub DsRolerDemoteDc +@ stub DsRolerGetDcOperationProgress +@ stub DsRolerGetDcOperationResults +@ stub LsaIAddNameToLogonSession +@ stub LsaIAllocateHeap +@ stub LsaIAllocateHeapZero +@ stub LsaIAuditAccountLogon +@ stub LsaIAuditAccountLogonEx +@ stub LsaIAuditKdcEvent +@ stub LsaIAuditKerberosLogon +@ stub LsaIAuditLogonUsingExplicitCreds +@ stub LsaIAuditNotifyPackageLoad +@ stub LsaIAuditPasswordAccessEvent +@ stub LsaIAuditSamEvent +@ stub LsaICallPackage +@ stub LsaICallPackageEx +@ stub LsaICallPackagePassthrough +@ stub LsaICancelNotification +@ stub LsaIChangeSecretCipherKey +@ stub LsaICryptProtectData +@ stub LsaICryptUnprotectData +@ stub LsaIDsNotifiedObjectChange +@ stub LsaIEnumerateSecrets +@ stub LsaIEventNotify +@ stub LsaIFilterSids +@ stub LsaIForestTrustFindMatch +@ stub LsaIFreeForestTrustInfo +@ stub LsaIFreeHeap +@ stub LsaIFreeReturnBuffer +@ stub LsaIFree_LSAI_PRIVATE_DATA #DATA +@ stub LsaIFree_LSAI_SECRET_ENUM_BUFFER +@ stdcall LsaIFree_LSAPR_ACCOUNT_ENUM_BUFFER(ptr) +@ stdcall LsaIFree_LSAPR_CR_CIPHER_VALUE(ptr) +@ stub LsaIFree_LSAPR_POLICY_DOMAIN_INFORMATION +@ stdcall LsaIFree_LSAPR_POLICY_INFORMATION(long ptr) +@ stdcall LsaIFree_LSAPR_PRIVILEGE_ENUM_BUFFER(ptr) +@ stdcall LsaIFree_LSAPR_PRIVILEGE_SET(ptr) +@ stdcall LsaIFree_LSAPR_REFERENCED_DOMAIN_LIST(ptr) +@ stdcall LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR(ptr) +@ stdcall LsaIFree_LSAPR_TRANSLATED_NAMES(ptr) +@ stdcall LsaIFree_LSAPR_TRANSLATED_SIDS(ptr) +@ stub LsaIFree_LSAPR_TRUSTED_DOMAIN_INFO +@ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER +@ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER_EX +@ stub LsaIFree_LSAPR_TRUST_INFORMATION +@ stub LsaIFree_LSAPR_UNICODE_STRING +@ stub LsaIFree_LSAPR_UNICODE_STRING_BUFFER +@ stub LsaIFree_LSAP_SITENAME_INFO +@ stub LsaIFree_LSAP_SITE_INFO +@ stub LsaIFree_LSAP_SUBNET_INFO +@ stub LsaIFree_LSAP_UPN_SUFFIXES +@ stub LsaIFree_LSA_FOREST_TRUST_COLLISION_INFORMATION +@ stub LsaIFree_LSA_FOREST_TRUST_INFORMATION +@ stub LsaIGetBootOption +@ stub LsaIGetCallInfo +@ stub LsaIGetForestTrustInformation +@ stub LsaIGetLogonGuid +@ stub LsaIGetNbAndDnsDomainNames +@ stub LsaIGetPrivateData +@ stub LsaIGetSerialNumberPolicy +@ stub LsaIGetSerialNumberPolicy2 +@ stub LsaIGetSiteName +@ stub LsaIHealthCheck +@ stub LsaIImpersonateClient +@ stub LsaIInitializeWellKnownSids +@ stub LsaIIsClassIdLsaClass +@ stub LsaIIsDsPaused +@ stub LsaIKerberosRegisterTrustNotification +@ stub LsaILookupWellKnownName +@ stub LsaINotifyChangeNotification +@ stub LsaINotifyNetlogonParametersChangeW +@ stub LsaINotifyPasswordChanged +@ stdcall LsaIOpenPolicyTrusted(ptr) +@ stub LsaIQueryForestTrustInfo +@ stub LsaIQueryInformationPolicyTrusted +@ stub LsaIQuerySiteInfo +@ stub LsaIQuerySubnetInfo +@ stub LsaIQueryUpnSuffixes +@ stub LsaIRegisterNotification +@ stub LsaIRegisterPolicyChangeNotificationCallback +@ stub LsaISafeMode +@ stub LsaISamIndicatedDsStarted +@ stub LsaISetBootOption +@ stub LsaISetClientDnsHostName +@ stub LsaISetLogonGuidInLogonSession +@ stub LsaISetPrivateData +@ stub LsaISetSerialNumberPolicy +@ stub LsaISetTimesSecret +@ stub LsaISetupWasRun +@ stub LsaITestCall +@ stub LsaIUnregisterAllPolicyChangeNotificationCallback +@ stub LsaIUnregisterPolicyChangeNotificationCallback +@ stub LsaIUpdateForestTrustInformation +@ stub LsaIWriteAuditEvent +@ stub LsapAuOpenSam +@ stub LsapCheckBootMode +@ stub LsapDsDebugInitialize +@ stub LsapDsInitializeDsStateInfo +@ stub LsapDsInitializePromoteInterface +@ stdcall LsapInitLsa() +@ stdcall LsarAddPrivilegesToAccount(ptr ptr) +@ stdcall LsarClose(ptr) +@ stdcall LsarCreateAccount(ptr ptr long ptr) +@ stdcall LsarCreateSecret(ptr ptr long ptr) +@ stdcall LsarCreateTrustedDomain(ptr ptr long ptr) +@ stdcall LsarCreateTrustedDomainEx(ptr ptr ptr long ptr) +@ stdcall LsarDelete(ptr) +@ stdcall LsarEnumerateAccounts(ptr ptr ptr long) +@ stdcall LsarEnumeratePrivileges(ptr ptr ptr long) +@ stdcall LsarEnumeratePrivilegesAccount(ptr ptr) +@ stdcall LsarEnumerateTrustedDomains(ptr ptr ptr long) +@ stdcall LsarEnumerateTrustedDomainsEx(ptr long ptr long) +@ stdcall LsarGetQuotasForAccount(ptr ptr) +@ stdcall LsarGetSystemAccessAccount(ptr ptr) +@ stdcall LsarLookupNames(ptr long ptr ptr ptr long ptr) +@ stdcall LsarLookupPrivilegeDisplayName(ptr ptr long long ptr ptr) +@ stdcall LsarLookupPrivilegeName(ptr ptr ptr) +@ stdcall LsarLookupPrivilegeValue(ptr ptr ptr) +@ stdcall LsarLookupSids(ptr ptr ptr ptr long ptr) +@ stdcall LsarLookupSids2(ptr ptr ptr ptr long long long long) +@ stdcall LsarOpenAccount(ptr ptr long ptr) +@ stdcall LsarOpenPolicy(ptr ptr long ptr) +@ stdcall LsarOpenPolicySce(ptr ptr long ptr) +@ stdcall LsarOpenSecret(ptr ptr long ptr) +@ stdcall LsarOpenTrustedDomain(ptr ptr long ptr) +@ stdcall LsarOpenTrustedDomainByName(ptr ptr long ptr) +@ stdcall LsarQueryDomainInformationPolicy(ptr long ptr) +@ stdcall LsarQueryForestTrustInformation(ptr ptr long ptr) +@ stdcall LsarQueryInfoTrustedDomain(ptr long ptr) +@ stdcall LsarQueryInformationPolicy(ptr long ptr) +@ stdcall LsarQuerySecret(ptr ptr ptr ptr ptr) +@ stdcall LsarQuerySecurityObject(ptr long ptr) +@ stdcall LsarQueryTrustedDomainInfo(ptr ptr long ptr) +@ stdcall LsarQueryTrustedDomainInfoByName(ptr ptr long ptr) +@ stdcall LsarRemovePrivilegesFromAccount(ptr long ptr) +@ stdcall LsarSetDomainInformationPolicy(ptr long long) +@ stdcall LsarSetForestTrustInformation(ptr ptr long ptr long ptr) +@ stdcall LsarSetInformationPolicy(ptr long ptr) +@ stdcall LsarSetInformationTrustedDomain(ptr long ptr) +@ stdcall LsarSetQuotasForAccount(ptr ptr) +@ stdcall LsarSetSecret(ptr ptr ptr) +@ stdcall LsarSetSecurityObject(ptr long ptr) +@ stdcall LsarSetSystemAccessAccount(ptr long) +@ stdcall LsarSetTrustedDomainInfoByName(ptr ptr long long) +@ stdcall ServiceInit()

7 years, 11 months

[pschweitzer] 73328: [KMTESTS:MM] This tests doesn't fail anylonger on ReactOS (not sure which rev fixed it) ROSTESTS-108

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Nov 20 20:58:22 2016 New Revision: 73328 URL: http://svn.reactos.org/svn/reactos?rev=73328&view=rev Log: [KMTESTS:MM] This tests doesn't fail anylonger on ReactOS (not sure which rev fixed it) ROSTESTS-108 Modified: trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c Modified: trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/ZwCreateS… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c [iso-8859-1] Sun Nov 20 20:58:22 2016 @@ -455,14 +455,10 @@ { NTSTATUS Status; HANDLE Section = NULL; -#ifdef ROSTESTS_108_FIXED PFILE_OBJECT FileObject; -#endif /* ROSTESTS_108_FIXED */ LARGE_INTEGER Length; Length.QuadPart = TestStringSize; -/* FIXME: Null pointer dereference. See ROSTESTS-108 */ -#ifdef ROSTESTS_108_FIXED //mimic lack of section support for a particular file as well. Status = ObReferenceObjectByHandle(FileHandle, STANDARD_RIGHTS_ALL, *IoFileObjectType, KernelMode, (PVOID *)&FileObject, NULL); if (!skip(NT_SUCCESS(Status), "Cannot reference object by handle\n")) @@ -474,7 +470,7 @@ FileObject->SectionObjectPointer = Pointers; ObDereferenceObject(FileObject); } -#endif /* ROSTESTS_108_FIXED */ + Length.QuadPart = TestStringSize; CREATE_SECTION(Section, (SECTION_ALL_ACCESS), NULL, Length, PAGE_READONLY, SEC_COMMIT, FileHandle, STATUS_SUCCESS, NO_HANDLE_CLOSE); CheckObject(Section, 2, 1);

7 years, 11 months

[pschweitzer] 73327: [NTOSKRNL] When we're really not able to init cache for creating a file section, return the appropriate status code

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Nov 20 20:55:17 2016 New Revision: 73327 URL: http://svn.reactos.org/svn/reactos?rev=73327&view=rev Log: [NTOSKRNL] When we're really not able to init cache for creating a file section, return the appropriate status code Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Nov 20 20:55:17 2016 @@ -3039,7 +3039,7 @@ /* FIXME: handle this situation */ ObDereferenceObject(Section); ObDereferenceObject(FileObject); - return STATUS_INVALID_PARAMETER; + return STATUS_INVALID_FILE_FOR_SECTION; } }

7 years, 11 months

[pschweitzer] 73326: [KMTESTS:MM] Thanks to r73325, these tests don't deadlock anymore on ReactOS. Enable them again (aka, revert r73227). ROSTESTS-248

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Nov 20 18:42:15 2016 New Revision: 73326 URL: http://svn.reactos.org/svn/reactos?rev=73326&view=rev Log: [KMTESTS:MM] Thanks to r73325, these tests don't deadlock anymore on ReactOS. Enable them again (aka, revert r73227). ROSTESTS-248 Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/NtCreateS… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c [iso-8859-1] Sun Nov 20 18:42:15 2016 @@ -19,12 +19,7 @@ UNICODE_STRING InitOnCreate = RTL_CONSTANT_STRING(L"\\Device\\Kmtest-NtCreateSection\\InitOnCreate"); UNICODE_STRING InitOnRW = RTL_CONSTANT_STRING(L"\\Device\\Kmtest-NtCreateSection\\InitOnRW"); UNICODE_STRING InvalidInit = RTL_CONSTANT_STRING(L"\\Device\\Kmtest-NtCreateSection\\InvalidInit"); - - if (skip(0, "ROSTESTS-248: skipping kmtest:NtCreateSection because it hangs on testbot\n")) - { - return; - } - + KmtLoadDriver(L"NtCreateSection", FALSE); KmtOpenDriver();

7 years, 11 months

[pschweitzer] 73325: [NTOSKRNL] When creating a new VACB, compare file offset to section size and not to file size. This fixes regression from r73199 where file size isn't changed anylonger, but se...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Nov 20 18:39:17 2016 New Revision: 73325 URL: http://svn.reactos.org/svn/reactos?rev=73325&view=rev Log: [NTOSKRNL] When creating a new VACB, compare file offset to section size and not to file size. This fixes regression from r73199 where file size isn't changed anylonger, but section size is. CORE-12430 ROSTESTS-248 Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=733… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sun Nov 20 18:39:17 2016 @@ -646,7 +646,7 @@ DPRINT("CcRosCreateVacb()\n"); - if (FileOffset >= SharedCacheMap->FileSize.QuadPart) + if (FileOffset >= SharedCacheMap->SectionSize.QuadPart) { *Vacb = NULL; return STATUS_INVALID_PARAMETER;

7 years, 11 months

[akhaldi] 73324: [UNIATA] Update to v0.46e1. CORE-11451

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Nov 20 15:58:03 2016 New Revision: 73324 URL: http://svn.reactos.org/svn/reactos?rev=73324&view=rev Log: [UNIATA] Update to v0.46e1. CORE-11451 Modified: trunk/reactos/drivers/storage/ide/uniata/atacmd_map.h trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bm_devs.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h Modified: trunk/reactos/drivers/storage/ide/uniata/atacmd_map.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atacmd_map.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atacmd_map.h [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -1,5 +1,5 @@ -// Build Version 0.46d7 +// Build Version 0.46d8 UCHAR const AtaCommands48[256] = { Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -1302,8 +1302,20 @@ IN ULONG DeviceNumber ); -ULONG NTAPI +ULONG +NTAPI AtapiFindIsaController( + IN PVOID HwDeviceExtension, + IN PVOID Context, + IN PVOID BusInformation, + IN PCHAR ArgumentString, + IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo, + OUT PBOOLEAN Again + ); + +ULONG +NTAPI +AtapiReadArgumentString( IN PVOID HwDeviceExtension, IN PVOID Context, IN PVOID BusInformation, Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -553,4 +553,4 @@ PCI_DEV_HW_SPEC_BM( ffff, ffff, 0xff, BMLIST_TERMINATOR, NULL , BMLIST_TERMINATOR ) }; -const ULONG _NUM_BUSMASTER_ADAPTERS = (sizeof(BusMasterAdapters) / sizeof(BUSMASTER_CONTROLLER_INFORMATION_BASE)); +/* static */ const ULONG _NUM_BUSMASTER_ADAPTERS = (sizeof(BusMasterAdapters) / sizeof(BUSMASTER_CONTROLLER_INFORMATION_BASE)); Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -1881,6 +1881,7 @@ extern BOOLEAN hasPCI; extern BOOLEAN InDriverEntry; +extern BOOLEAN g_Dump; extern BOOLEAN g_opt_Verbose; extern ULONG g_opt_VirtualMachine; Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -105,6 +105,7 @@ ULONG g_opt_VirtualMachine = 0; // Auto BOOLEAN InDriverEntry = TRUE; +BOOLEAN g_Dump = FALSE; BOOLEAN g_opt_Verbose = 0; @@ -5036,7 +5037,7 @@ return TRUE; } - if(!DmaTransfer && !atapiDev) { + if((!DmaTransfer && !atapiDev) || deviceExtension->DriverMustPoll) { KdPrint2((PRINT_PREFIX " service PIO HDD\n")); UseDpc = FALSE; } @@ -6139,7 +6140,9 @@ } else { // srb->Cdb[0] == SCSIOP_REQUEST_SENSE) PSENSE_DATA senseData = (PSENSE_DATA) srb->DataBuffer; +#ifdef __REACTOS__ (void)senseData; +#endif KdPrint3((PRINT_PREFIX "AtapiInterrupt: ATAPI command status %#x\n", status)); if (status == SRB_STATUS_DATA_OVERRUN) { // Check to see if we at least get mininum number of bytes @@ -10516,16 +10519,56 @@ LARGE_INTEGER t0, t1; - Connect_DbgPrint(); KdPrint2((PRINT_PREFIX "%s", (PCCHAR)ver_string)); //a = (WCHAR)strlen(ver_string); - g_opt_Verbose = (BOOLEAN)AtapiRegCheckDevValue(NULL, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"PrintLogo", 0); - if(g_opt_Verbose) { - _PrintNtConsole("Universal ATA driver v 0." UNIATA_VER_STR "\n"); - } - IgnoreIsaCompatiblePci = (BOOLEAN)AtapiRegCheckDevValue(NULL, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"IgnoreIsaCompatiblePci", IgnoreIsaCompatiblePci) ? TRUE : FALSE; - IgnoreNativePci = (BOOLEAN)AtapiRegCheckDevValue(NULL, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"IgnoreNativePci", IgnoreNativePci) ? TRUE : FALSE; + statusToReturn = 0xffffffff; + + // Zero out structure. + RtlZeroMemory(((PCHAR)&hwInitializationData), sizeof(hwInitializationData)); + + // Set size of hwInitializationData. + hwInitializationData.comm.HwInitializationDataSize = + sizeof(hwInitializationData.comm) + +// sizeof(hwInitializationData.nt4) + + ((WinVer_Id() <= WinVer_NT) ? 0 : sizeof(hwInitializationData.w2k)); + KdPrint(("HwInitializationDataSize = %x\n", hwInitializationData.comm.HwInitializationDataSize)); + + // Set entry points. + hwInitializationData.comm.HwInitialize = (PHW_INITIALIZE)AtapiHwInitialize; + hwInitializationData.comm.HwResetBus = (PHW_RESET_BUS)AtapiResetController; + hwInitializationData.comm.HwStartIo = (PHW_STARTIO)AtapiStartIo; + hwInitializationData.comm.HwInterrupt = (PHW_INTERRUPT)AtapiInterrupt; + + // Specify size of extensions. + hwInitializationData.comm.DeviceExtensionSize = sizeof(HW_DEVICE_EXTENSION); + hwInitializationData.comm.SpecificLuExtensionSize = sizeof(HW_LU_EXTENSION); + hwInitializationData.comm.SrbExtensionSize = sizeof(ATA_REQ); + + // Indicate PIO device. + hwInitializationData.comm.MapBuffers = TRUE; + + // Request and parse arument string. + KdPrint2((PRINT_PREFIX "\n\nUniATA: parse ArgumentString\n")); + // Zero out structure. + hwInitializationData.comm.NumberOfAccessRanges = 2; + hwInitializationData.comm.HwFindAdapter = AtapiReadArgumentString; + ScsiPortInitialize(DriverObject, + Argument2, + &hwInitializationData.comm, + &adapterCount); + + if(!g_Dump) { + Connect_DbgPrint(); + g_opt_Verbose = (BOOLEAN)AtapiRegCheckDevValue(NULL, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"PrintLogo", 0); + if(g_opt_Verbose) { + _PrintNtConsole("Universal ATA driver v 0." UNIATA_VER_STR "\n"); + } + IgnoreIsaCompatiblePci = (BOOLEAN)AtapiRegCheckDevValue(NULL, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"IgnoreIsaCompatiblePci", IgnoreIsaCompatiblePci) ? TRUE : FALSE; + IgnoreNativePci = (BOOLEAN)AtapiRegCheckDevValue(NULL, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"IgnoreNativePci", IgnoreNativePci) ? TRUE : FALSE; + } else { + KdPrint(("crashdump mode\n")); + } if(!SavedDriverObject) { SavedDriverObject = (PDRIVER_OBJECT)DriverObject; @@ -10597,31 +10640,6 @@ g_LogToDisplay = AtapiRegCheckDevValue(NULL, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"LogToDisplay", 0); #endif //_DEBUG - statusToReturn = 0xffffffff; - - // Zero out structure. - RtlZeroMemory(((PCHAR)&hwInitializationData), sizeof(hwInitializationData)); - - // Set size of hwInitializationData. - hwInitializationData.comm.HwInitializationDataSize = - sizeof(hwInitializationData.comm) + -// sizeof(hwInitializationData.nt4) + - ((WinVer_Id() <= WinVer_NT) ? 0 : sizeof(hwInitializationData.w2k)); - KdPrint(("HwInitializationDataSize = %x\n", hwInitializationData.comm.HwInitializationDataSize)); - - // Set entry points. - hwInitializationData.comm.HwInitialize = (PHW_INITIALIZE)AtapiHwInitialize; - hwInitializationData.comm.HwResetBus = (PHW_RESET_BUS)AtapiResetController; - hwInitializationData.comm.HwStartIo = (PHW_STARTIO)AtapiStartIo; - hwInitializationData.comm.HwInterrupt = (PHW_INTERRUPT)AtapiInterrupt; - - // Specify size of extensions. - hwInitializationData.comm.DeviceExtensionSize = sizeof(HW_DEVICE_EXTENSION); - hwInitializationData.comm.SpecificLuExtensionSize = sizeof(HW_LU_EXTENSION); - hwInitializationData.comm.SrbExtensionSize = sizeof(ATA_REQ); - - // Indicate PIO device. - hwInitializationData.comm.MapBuffers = TRUE; // Set PnP-specific API if(WinVer_Id() > WinVer_NT) { KdPrint(("set NeedPhysicalAddresses = TRUE\n")); @@ -10723,7 +10741,7 @@ SecondaryClaimed = TRUE; pref_alt = 0; - if(!WinVer_WDM_Model && !PrimaryClaimed && !SecondaryClaimed && + if(!WinVer_WDM_Model && !PrimaryClaimed && !SecondaryClaimed && !g_Dump && !(BMList[i].ChanInitOk & 0x80)) { // We just want to claim our PCI device in compatible mode, since we shall not @@ -11295,6 +11313,10 @@ UNICODE_STRING paramPath; + if(g_Dump) { + goto failed; + } + // <SavedRegPath>\<PathSuffix> -> <Name> // KdPrint(( "AtapiCheckRegValue: %ws -> %ws\n", PathSuffix, Name)); // KdPrint(( "AtapiCheckRegValue: RegistryPath %ws\n", RegistryPath->Buffer)); @@ -11332,6 +11354,7 @@ ExFreePool(paramPath.Buffer); if(!NT_SUCCESS(status)) { +failed: doRun = Default; } Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -1148,14 +1148,14 @@ if(ChipType == ATPOLD) { /* Old Acard 850 */ - static const USHORT reg4x = 0x0301; + static const USHORT reg4x2 = 0x0301; for(i=udmamode; i>=0; i--) { if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_UDMA + i)) { set_old_acard: ChangePciConfig1(0x54, a | (0x01 << dev) | ((i+1) << (dev*2))); SetPciConfig1(0x4a, reg4a); - SetPciConfig2(reg, reg4x); + SetPciConfig2(reg, reg4x2); return; } Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -623,6 +623,7 @@ } if(deviceExtension->MaxTransferMode >= ATA_SA150) { + KdPrint2((PRINT_PREFIX "setting UNIATA_SATA flag\n")); deviceExtension->HwFlags |= UNIATA_SATA; } @@ -977,13 +978,16 @@ i = AtapiFindListedDev((BUSMASTER_CONTROLLER_INFORMATION_BASE*)&SiSSouthAdapters[0], -1, HwDeviceExtension, SystemIoBusNumber, PCISLOTNUM_NOT_SPECIFIED, NULL); if(i != BMLIST_TERMINATOR) { + KdPrint2((PRINT_PREFIX "SIS South\n")); deviceExtension->HwFlags = (deviceExtension->HwFlags & ~CHIPTYPE_MASK) | SIS133OLD; deviceExtension->MaxTransferMode = ATA_UDMA6; //deviceExtension->MaxTransferMode = SiSSouthAdapters[i].MaxTransferMode; if(SiSSouthAdapters[i].RaidFlags & UNIATA_SATA) { + KdPrint2((PRINT_PREFIX "SIS South SATA\n")); deviceExtension->HwFlags |= UNIATA_SATA; if(SiSSouthAdapters[i].nDeviceId == 0x1182 || SiSSouthAdapters[i].nDeviceId == 0x1183) { + KdPrint2((PRINT_PREFIX "SIS_182\n")); SIS_182 = TRUE; } } Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -1256,6 +1256,14 @@ /***********************************************************/ deviceExtension->UseDpc = TRUE; +#ifndef UNIATA_CORE + if (g_Dump) { + deviceExtension->DriverMustPoll = TRUE; + deviceExtension->UseDpc = FALSE; + deviceExtension->simplexOnly = TRUE; + deviceExtension->HwFlags |= UNIATA_NO_DPC; + } +#endif //UNIATA_CORE KdPrint2((PRINT_PREFIX "HwFlags = %x\n (3)", deviceExtension->HwFlags)); if(deviceExtension->HwFlags & UNIATA_NO_DPC) { /* CMD 649, ROSB SWK33, ICH4 */ @@ -2036,10 +2044,21 @@ KdPrint2((PRINT_PREFIX "Init ISR:\n")); + /* + We MUST register 2nd ISR for multichannel controllers even for UP systems. + This is needed for cases when + multichannel controller generate interrupt while we are still in its ISR for + other channle's interrupt. New interrupt must be detected and queued for + further processing. If we do not do this, system will not route this + interrupt to main ISR (since it is busy) and we shall get to infinite loop + looking for interrupt handler. + */ + if(!deviceExtension->MasterDev && (deviceExtension->NumberChannels > 1) && // do not touch MasterDev !deviceExtension->simplexOnly && /* // this is unnecessary on simplex controllers !BMList[i].Isr2DevObj*/ // handle re-init under w2k+ /*!ForceSimplex*/ + /*(CPU_num > 1) && // unnecessary for UP systems*/ TRUE) { // Ok, continue... KdPrint2((PRINT_PREFIX "Multichannel native mode, go...\n")); @@ -2340,14 +2359,23 @@ // if not, we go and find ourselves if (preConfig == FALSE) { + ULONG portBase_reg = 0; + ULONG irq_reg = 0; + if (!portBase) { portBase = AdapterAddresses[*adapterCount]; KdPrint2((PRINT_PREFIX "portBase[%d]=%x\n", *adapterCount, portBase)); } else { KdPrint2((PRINT_PREFIX "portBase=%x\n", portBase)); } - portBase = AtapiRegCheckDevValue(deviceExtension, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"PortBase", portBase); - irq = AtapiRegCheckDevValue(deviceExtension, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"Irq", irq); + + portBase_reg = AtapiRegCheckDevValue(deviceExtension, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"PortBase", 0); + irq_reg = AtapiRegCheckDevValue(deviceExtension, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"Irq", 0); + if(portBase_reg && irq_reg) { + KdPrint2((PRINT_PREFIX "use registry settings portBase=%x, irq=%d\n", portBase_reg, irq_reg)); + portBase = portBase_reg; + irq = irq_reg; + } // check if Primary/Secondary Master IDE claimed if(AtapiCheckIOInterference(ConfigInfo, portBase)) { goto next_adapter; @@ -2587,26 +2615,11 @@ // Determine whether this driver is being initialized by the // system or as a crash dump driver. - if (ArgumentString) { - + if (g_Dump) { #ifndef UNIATA_CORE - if (AtapiParseArgumentString(ArgumentString, "dump") == 1) { - KdPrint2((PRINT_PREFIX - "AtapiFindIsaController: Crash dump\n")); - //atapiOnly = FALSE; - deviceExtension->DriverMustPoll = TRUE; - } else { - KdPrint2((PRINT_PREFIX - "AtapiFindIsaController: Atapi Only\n")); - //atapiOnly = TRUE; - deviceExtension->DriverMustPoll = FALSE; - } + deviceExtension->DriverMustPoll = TRUE; #endif //UNIATA_CORE } else { - - KdPrint2((PRINT_PREFIX - "AtapiFindIsaController: Atapi Only (2)\n")); - //atapiOnly = TRUE; deviceExtension->DriverMustPoll = FALSE; } @@ -2690,6 +2703,8 @@ (*ConfigInfo->AccessRanges)[i].RangeLength = 0; (*ConfigInfo->AccessRanges)[i].RangeInMemory = FALSE; } + irq = 0; + portBase = 0; } #ifndef UNIATA_CORE } @@ -2713,6 +2728,34 @@ return SP_RETURN_ERROR; } // end AtapiFindIsaController() + +/* + Do nothing, but parse ScsiPort ArgumentString and setup global variables. +*/ + +ULONG +NTAPI +AtapiReadArgumentString( + IN PVOID HwDeviceExtension, + IN PVOID Context, + IN PVOID BusInformation, + IN PCHAR ArgumentString, + IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo, + OUT PBOOLEAN Again + ) +{ +#ifndef __REACTOS__ + PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; +#endif + + if (AtapiParseArgumentString(ArgumentString, "dump") == 1) { + KdPrint2((PRINT_PREFIX + "AtapiReadArgumentString: Crash dump\n")); + //atapiOnly = FALSE; + g_Dump = TRUE; + } + return(SP_RETURN_NOT_FOUND); +} // end AtapiReadArgumentString() ULONG NTAPI @@ -3017,7 +3060,7 @@ // Issue the ATAPI identify command if this // is not for the crash dump utility. try_atapi: - if (!deviceExtension->DriverMustPoll) { + if (!g_Dump) { // Issue ATAPI packet identify command. if (IssueIdentify(HwDeviceExtension, Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -1,10 +1,10 @@ -#define UNIATA_VER_STR "46d7" -#define UNIATA_VER_DOT 0.46.4.7 +#define UNIATA_VER_STR "46d8" +#define UNIATA_VER_DOT 0.46.4.8 #define UNIATA_VER_MJ 0 #define UNIATA_VER_MN 46 #define UNIATA_VER_SUB_MJ 4 -#define UNIATA_VER_SUB_MN 7 -#define UNIATA_VER_DOT_COMMA 0,46,4,7 -#define UNIATA_VER_DOT_STR "0.46.4.7" +#define UNIATA_VER_SUB_MN 8 +#define UNIATA_VER_DOT_COMMA 0,46,4,8 +#define UNIATA_VER_DOT_STR "0.46.4.8" #define UNIATA_VER_YEAR 2016 #define UNIATA_VER_YEAR_STR "2016"

7 years, 11 months

[pschweitzer] 73323: [NTOSKRNL] Use the appropriated macro to check for pending operations. NFC ROSTESTS-248

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Nov 20 10:51:26 2016 New Revision: 73323 URL: http://svn.reactos.org/svn/reactos?rev=73323&view=rev Log: [NTOSKRNL] Use the appropriated macro to check for pending operations. NFC ROSTESTS-248 Modified: trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=733… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Sun Nov 20 10:51:26 2016 @@ -146,7 +146,7 @@ */ Entry = MmGetPageEntrySectionSegment(MemoryArea->Data.SectionData.Segment, (PLARGE_INTEGER)&Offset); - if (Entry && IS_SWAP_FROM_SSE(Entry) && SWAPENTRY_FROM_SSE(Entry) == MM_WAIT_ENTRY) + if (Entry && MM_IS_WAIT_PTE(Entry)) { MmUnlockSectionSegment(MemoryArea->Data.SectionData.Segment); MmUnlockAddressSpace(AddressSpace); 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] Sun Nov 20 10:51:26 2016 @@ -1354,7 +1354,7 @@ * Check if someone else is already handling this fault, if so wait * for them */ - if (Entry && IS_SWAP_FROM_SSE(Entry) && SWAPENTRY_FROM_SSE(Entry) == MM_WAIT_ENTRY) + if (Entry && MM_IS_WAIT_PTE(Entry)) { MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); @@ -4021,7 +4021,7 @@ Segment = MemoryArea->Data.SectionData.Segment; Entry = MmGetPageEntrySectionSegment(Segment, &Offset); - while (Entry && IS_SWAP_FROM_SSE(Entry) && SWAPENTRY_FROM_SSE(Entry) == MM_WAIT_ENTRY) + while (Entry && MM_IS_WAIT_PTE(Entry)) { MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace);

7 years, 11 months

[tfaber] 73322: [NOTEPAD] - Update the window title on Save. Based on a patch by Thomas Csovcsity. CORE-12423 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Nov 20 09:16:19 2016 New Revision: 73322 URL: http://svn.reactos.org/svn/reactos?rev=73322&view=rev Log: [NOTEPAD] - Update the window title on Save. Based on a patch by Thomas Csovcsity. CORE-12423 #resolve Modified: trunk/reactos/base/applications/notepad/dialog.c Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Sun Nov 20 09:16:19 2016 @@ -438,9 +438,15 @@ BOOL DIALOG_FileSave(VOID) { if (Globals.szFileName[0] == 0) + { return DIALOG_FileSaveAs(); - else - return DoSaveFile(); + } + else if (DoSaveFile()) + { + UpdateWindowCaption(TRUE); + return TRUE; + } + return FALSE; } static UINT_PTR

7 years, 11 months

[mjansen] 73321: [CMD] Wait for commands to exit when run with /C or /K. CORE-12402 #resolve

by mjansen＠svn.reactos.org

Author: mjansen Date: Fri Nov 18 19:53:40 2016 New Revision: 73321 URL: http://svn.reactos.org/svn/reactos?rev=73321&view=rev Log: [CMD] Wait for commands to exit when run with /C or /K. CORE-12402 #resolve Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Fri Nov 18 19:53:40 2016 @@ -157,6 +157,7 @@ BOOL bCanExit = TRUE; /* indicates if this shell is exitable */ BOOL bCtrlBreak = FALSE; /* Ctrl-Break or Ctrl-C hit */ BOOL bIgnoreEcho = FALSE; /* Set this to TRUE to prevent a newline, when executing a command */ +static BOOL bWaitForCommand = FALSE; /* When we are executing something passed on the commandline after /c or /k */ INT nErrorLevel = 0; /* Errorlevel of last launched external program */ CRITICAL_SECTION ChildProcessRunningLock; BOOL bUnicodeOutput = FALSE; @@ -442,7 +443,7 @@ if (prci.hProcess != NULL) { - if (bc != NULL || IsConsoleProcess(prci.hProcess)) + if (bc != NULL || bWaitForCommand || IsConsoleProcess(prci.hProcess)) { /* when processing a batch file or starting console processes: execute synchronously */ EnterCriticalSection(&ChildProcessRunningLock); @@ -1761,7 +1762,9 @@ { /* Do the /C or /K command */ GetCmdLineCommand(commandline, &ptr[2], AlwaysStrip); + bWaitForCommand = TRUE; nExitCode = ParseCommandLine(commandline); + bWaitForCommand = FALSE; if (option != _T('K')) { nErrorLevel = nExitCode;

7 years, 11 months

← Newer
1
...
6
7
8
9
10
11
12
...
32
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 November 2016