Ros-diffs September 2016

ros-diffs@reactos.org

18 participants
342 discussions

[akhaldi] 72610: [GDI32_WINETEST] Sync with Wine Staging 1.9.18.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Sep 7 22:12:51 2016 New Revision: 72610 URL: http://svn.reactos.org/svn/reactos?rev=72610&view=rev Log: [GDI32_WINETEST] Sync with Wine Staging 1.9.18. Modified: trunk/rostests/winetests/gdi32/dib.c Modified: trunk/rostests/winetests/gdi32/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/dib.c?rev… ============================================================================== --- trunk/rostests/winetests/gdi32/dib.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/dib.c [iso-8859-1] Wed Sep 7 22:12:51 2016 @@ -132,7 +132,7 @@ "a1fe9aa885584a0f713d7c6f76c89830fbf28563", "d7085333becdec7759a5229e5fe9ba1e11db0c22", "aaf62842bb98d8a2945c4f643baf50afaeea9307", - "287b2f2f2fb5a1d7ee4a29b43342103d78a7a8ab", + "d7e34fa02db7ad52327f80389bd1ba1b72b6c692", "d7dd4700f49808541bba99244b7eb5840e0a2439", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "568f87f0194ca19b69a5b2bcdef795d89c5721ce", @@ -205,7 +205,7 @@ "a1fe9aa885584a0f713d7c6f76c89830fbf28563", "d7085333becdec7759a5229e5fe9ba1e11db0c22", "aaf62842bb98d8a2945c4f643baf50afaeea9307", - "287b2f2f2fb5a1d7ee4a29b43342103d78a7a8ab", + "d7e34fa02db7ad52327f80389bd1ba1b72b6c692", "d7dd4700f49808541bba99244b7eb5840e0a2439", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "568f87f0194ca19b69a5b2bcdef795d89c5721ce", @@ -278,7 +278,7 @@ "88fd743d00bd37d2ed722092146795b044d08a6e", "c0537ec24147e74939219213d864ee113cad9967", "118bf4c5bddc206ba737f7aa8b239940cd1aadc2", - "7cb51f6c5f1dae926601986c934533df5f8baa9f", + "eac5d164b83edf2cf85bac242686f9f617ec1fa4", "86c84cc8306975edecc6d4a89a8aff29f59b55a7", "af99228aa4cfbd1f61bd824db046144a3c6c2ed7", "25675c30adfe24d6cae60793b156dfdaa36ac3ba", @@ -351,7 +351,7 @@ "0790585dfaef94f912b1ee81477d4ac448708708", "589fb8a85d924ad19ed78409ae89475ba479c30a", "43d67bc61ef54014b022891e5c024fc24b1fe797", - "e8783644428b637adbe80bcd084a33428cb69983", + "5a713a91fd471fd331bd13b0868c994aa2ffe2b2", "fc0c32afb719295f28bcfef22803bef94f798e20", "36f6db4fbe2a1630a7597d3a446f2902755c96ef", "d3f08946300e1700865042aed121870e292d1095", @@ -424,7 +424,7 @@ "47499ad13b719de18c59c2bc9b38ed578db50b95", "643e82ac67ab2b0c034a3fcfa498b072a5f2be5c", "cd01f2c0a63b2229d4467d2f874d58edca32b3d4", - "94b54f1da5212b3f3a1195eda5ea927e160bc89d", + "8ad5cd520cd628b76d2e5a3f318ae1bbb6b4c994", "49341c297a887186bd47d7465d827ab3147f05e3", "325279e76367200d3fd7194d81c09fd139988ece", "c3def160a1e847605ff0fc7edd30397fa90635a0", @@ -497,7 +497,7 @@ "80086808fca03e757d812e31d1ae576bf90dac9d", "9560096f1b85ae6d939d736165c44df00a47c424", "1015e0217ea13eaa62c7666b8b81aafd75f8f610", - "93e1aec608e037af3bfb7bd32dde446abe4eea11", + "5578c80048520732557abf3a3a3fa22c85015d7d", "b25ba91487ec945410deb2b51bc1156890c032a8", "d347ca5c6c4b6a61389247c3b6f61564033e8c25", "ee315634ed92da3a32c2675ecd1b369471c60936", @@ -573,7 +573,7 @@ "059db9f0426b371e464ef3d30f1a4f4aa599e101", "a52d6ceee5c2a04b4e059c0d49337a997cc17e40", "aa4a0a4b7f2697aaf270c89874631974bd9d7183", - "585061e403d9cac1603a38af420efe87338f381a", + "a7506e2c001d271593297c9eda9b984d4d894774", "8f447a3820c83662086dfa836da2205b0130fd5f", "3772003c7fb420003512d0c437b3659d96d89ce4", "dab47c9dc149e570045d699598b14a613bf319b3", @@ -646,7 +646,7 @@ "8c40d6d8e0c696c31f04c896e492a2a38703d870", "e13c821c236ea0b67cca64c9da7be15e88fc712f", "9af4907a8144458a73dbb7471784f8c3d9aeffcf", - "e4731b63d41f6b51e30752ea52d85c4a2938731b", + "104e85bad287a62dfe25f0e78280179f18bac765", "f0acb3cfcda62e95bee5f7bc8830ffeb3dd7e5a7", "07b10c3f191d0a93e5e5694aae37dcad407e10f5", "f7900e60347029876ba55e8f0c4c02e89deb36b6", @@ -724,7 +724,7 @@ "46f772c2832b3aad584674db666bd63e48b4f338", "a9f9ca0049235db51ab7359a5fc3d21be42d2aac", "f3dc739da41fb299637c8660e8c46917ddcf87a8", - "eae47bf865d932f22a6e59b6fe8d041f220e1fbc", + "abd2fff80f74b311072ecdb91ce9ceba268fa6e9", "9ae38bb94c7b4c0c6dfebbee23d1de4db9b77488", "678979a45126a76eb629992cd64734862f53a555", "2f7ba8803604c032cb1a1228bc021f0f1c03e245", @@ -806,7 +806,7 @@ "640a49455acabca6954a7fbb6af4e872af342d11", "589e7911e09332ee090371deae17b0120ff990b5", "a1a941fa270cda48c648553ed4b427e16e96f8e0", - "f30a8d9f73ca043c5bfc18d9595e299fc0a39eec", + "115c90df05b1ff754dbdfe2a712ef126034d952d", "fb63bbb2f944fb63ed2d7399f07b168740c1034b", "3685c9ae95118a83db3569832c29753276fa1264", "09640bad951c33e7d70a1fced83b1869f65b3fc5", @@ -883,7 +883,7 @@ "9e996fc74eeef53f0a6c31aabb2edce6e103f189", "6b8abd1785304d6531c1e4cc65c1ffcdcb2196a5", "7d1bfff706b0713e53209407889f83a0da26a81d", - "31e667c2dbb81dcf81d01cb88f794e88ddb90ff2", + "5a1d8f9ea978b820edbc5c9e1c6f1cac022620ad", "31e667c2dbb81dcf81d01cb88f794e88ddb90ff2", "465d9cd0a77ab4fcf035aa67544b2a26269e0b09", "600d6b2713d5e4c0d90c02660245ed26c7ae3033", @@ -955,7 +955,7 @@ "7811c536a6527112b438a6413f3927f2c79086a7", "525ef3615040225752a2fe646ab99ee64e360630", "46760975993f9881b7bbe94123173e6a683d3f25", - "df5feb905a31c288008cf5e82d73ac818a160d82", + "c644f460937107214a88d5eb9e846d27abd8c874", "df5feb905a31c288008cf5e82d73ac818a160d82", "d8af3868c66c7d6dac35ec8ee0317b38a6910bb1", "ec8e2aebfb4a1c28ebcd0e053b9e4d8638b50951", @@ -1027,7 +1027,7 @@ "2f3fb1bd8f416198d70e06f6d519571cd5eb4ef4", "cc96ccaf6b99f60a49b03017515f83cba22b4c40", "5eeb56afea8040a8fb18c11f29931b836474126d", - "a3405c085fc2f2184bcd0d1edcdcc66927e33659", + "30c256a783c4874261667bb31307eb282ab9470e", "f8681c09f1abfc38d31e47622cb8798cd896a00e", "b5ee51cfc73acb59a2f6124509ea236f8fc7f9f7", "d374d4d92c940ae42a9b42c14d744341b68a8c14", @@ -1117,7 +1117,7 @@ "ee22f43ea867228c6ff937d39e1826e285a107e8", "832c3c3afd056e5d1cdfb2f466f27225c4adcc6c", "a2a928de9007d765da496abec8c21b23601f8c45", - "28ded40e72d4327b9413571476b167fb28a1f420", + "41a417c1f25f2619301afa44bfcde85198985792", "23366004515f3bc46796ea505d748f8d0f97fbe1", "88763f8e8fcf4f78fa864325791a9dd35a0bd279", "013cee26bac8f815eadad4bfc012d9b5d01c3b7f", @@ -1191,7 +1191,7 @@ { 100, 100, 356, 356 }, { 100, 100, 356, 356 }, { 100, 100, 356, 356 }, - { 100, 100, 356, 356 }, + { 10, 10, 356, 356 }, { 100, 100, 356, 356 }, { 10, 10, 416, 26 }, { 10, 8, 60, 104 }, @@ -2402,6 +2402,12 @@ src_bits[(y * 256 + x) / 8] = 7 * x + 3 * y; BitBlt( hdc, 100, 100, 256, 256, src_dc, 0, 0, SRCCOPY ); + /* Some interesting src co-ords */ + BitBlt( hdc, 10, 10, 3, 10, src_dc, 0, 0, SRCCOPY ); + BitBlt( hdc, 20, 10, 3, 10, src_dc, 2, 0, SRCCOPY ); + BitBlt( hdc, 30, 10, 3, 10, src_dc, 5, 0, SRCCOPY ); + BitBlt( hdc, 40, 10, 3, 10, src_dc, 6, 0, SRCCOPY ); + BitBlt( hdc, 50, 10, 20, 10, src_dc, 6, 0, SRCCOPY ); compare_hash(hdc, bmi, bits, "BitBlt src 1-bpp SRCCOPY" ); blend.SourceConstantAlpha = 0x90;

8 years, 3 months

[dchapyshev] 72609: [NTOS] - Add missed _SEH2_YIELD's

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Sep 7 18:52:09 2016 New Revision: 72609 URL: http://svn.reactos.org/svn/reactos?rev=72609&view=rev Log: [NTOS] - Add missed _SEH2_YIELD's Modified: trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/ex/locale.c trunk/reactos/ntoskrnl/lpc/port.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ps/quota.c trunk/reactos/ntoskrnl/se/audit.c trunk/reactos/ntoskrnl/se/sid.c trunk/reactos/ntoskrnl/se/token.c trunk/reactos/ntoskrnl/wmi/wmidrv.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -1545,16 +1545,16 @@ { *ResultLength = FIELD_OFFSET(KEY_NAME_INFORMATION, Name) + NeededLength; if (Length < RTL_SIZEOF_THROUGH_FIELD(KEY_NAME_INFORMATION, NameLength)) - return STATUS_BUFFER_TOO_SMALL; + _SEH2_YIELD(return STATUS_BUFFER_TOO_SMALL); if (Length < *ResultLength) { KeyNameInfo->NameLength = NeededLength; - return STATUS_BUFFER_OVERFLOW; + _SEH2_YIELD(return STATUS_BUFFER_OVERFLOW); } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -1597,7 +1597,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -1058,7 +1058,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; Modified: trunk/reactos/ntoskrnl/ex/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/locale.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -432,7 +432,7 @@ _SEH2_EXCEPT(ExSystemExceptionFilter()) { /* Return exception code */ - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; Modified: trunk/reactos/ntoskrnl/lpc/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/port.c?rev=72… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -152,7 +152,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { DPRINT1("Got exception!\n"); - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; } Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -785,7 +785,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { DPRINT1("Got exception!\n"); - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; } Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -4321,7 +4321,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; } Modified: trunk/reactos/ntoskrnl/ps/quota.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=72… ============================================================================== --- trunk/reactos/ntoskrnl/ps/quota.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/quota.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -335,7 +335,7 @@ (CapturedQuotaLimits.Flags & QUOTA_LIMITS_HARDWS_MAX_DISABLE))) { DPRINT1("Invalid quota flags: 0x%lx\n", CapturedQuotaLimits.Flags); - return STATUS_INVALID_PARAMETER; + _SEH2_YIELD(return STATUS_INVALID_PARAMETER); } /* Verify that the caller didn't pass reserved values */ @@ -351,19 +351,19 @@ CapturedQuotaLimits.Reserved3, CapturedQuotaLimits.Reserved4, CapturedQuotaLimits.CpuRateLimit.RateData); - return STATUS_INVALID_PARAMETER; + _SEH2_YIELD(return STATUS_INVALID_PARAMETER); } } else { DPRINT1("Invalid quota size: 0x%lx\n", QuotaLimitsLength); - return STATUS_INFO_LENGTH_MISMATCH; + _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { DPRINT1("Exception while copying data\n"); - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; Modified: trunk/reactos/ntoskrnl/se/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/audit.c?rev=72… ============================================================================== --- trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -306,7 +306,7 @@ { ExFreePoolWithTag(*CapturedObjectTypeList, TAG_SEPA); *CapturedObjectTypeList = NULL; - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -501,7 +501,7 @@ { Status = _SEH2_GetExceptionCode(); DPRINT1("Exception while probing parameters: 0x%lx\n", Status); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -1137,7 +1137,7 @@ { Status = _SEH2_GetExceptionCode(); DPRINT1("Exception while probing parameters: 0x%lx\n", Status); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -1351,7 +1351,7 @@ { Status = _SEH2_GetExceptionCode(); DPRINT1("Got exception 0x%lx\n", Status); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; Modified: trunk/reactos/ntoskrnl/se/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sid.c?rev=7260… ============================================================================== --- trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -414,7 +414,7 @@ if (((Sid->Revision & 0xF) != SID_REVISION) || (Sid->SubAuthorityCount > SID_MAX_SUB_AUTHORITIES)) { - return STATUS_INVALID_SID; + _SEH2_YIELD(return STATUS_INVALID_SID); } /* Calculate the SID length and probe the full SID */ @@ -427,7 +427,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; } Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=72… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -1832,7 +1832,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -1872,7 +1872,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -1912,7 +1912,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -1979,7 +1979,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -2006,7 +2006,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -2090,7 +2090,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -2125,7 +2125,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -2593,7 +2593,7 @@ { /* Do cleanup and return the exception code */ Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -2621,7 +2621,7 @@ { /* Do cleanup and return the exception code */ Status = _SEH2_GetExceptionCode(); - goto Cleanup; + _SEH2_YIELD(goto Cleanup); } _SEH2_END; @@ -2751,7 +2751,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Return the exception code */ - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; } Modified: trunk/reactos/ntoskrnl/wmi/wmidrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmidrv.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] Wed Sep 7 18:52:09 2016 @@ -144,7 +144,7 @@ /* Check if the object name has the expected length */ if (CapturedObjectName->Length != 45 * sizeof(WCHAR)) { - return STATUS_INVALID_PARAMETER; + _SEH2_YIELD(return STATUS_INVALID_PARAMETER); } /* Probe and copy the object name buffer */ @@ -162,7 +162,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { DPRINT1("Got exception!\n"); - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END;

8 years, 3 months

[dchapyshev] 72608: [NTOS:EX] - Use ExAcquirePushLockShared instead ExAcquirePushLockExclusive (and move it outside enumeration) - Don't leave a enumeration at ReqSize > Size. It is used for calcul...

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Sep 7 17:34:17 2016 New Revision: 72608 URL: http://svn.reactos.org/svn/reactos?rev=72608&view=rev Log: [NTOS:EX] - Use ExAcquirePushLockShared instead ExAcquirePushLockExclusive (and move it outside enumeration) - Don't leave a enumeration at ReqSize > Size. It is used for calculation of the size - ObjectHeader->Type field currupted and I do not know who spoils it. Commented. - Remove unneeded SEH Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Wed Sep 7 17:34:17 2016 @@ -222,7 +222,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExFreePoolWithTag(Mdl, TAG_MDL); - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -1171,14 +1171,19 @@ QSI_DEF(SystemHandleInformation) { PSYSTEM_HANDLE_INFORMATION HandleInformation; + PLIST_ENTRY NextTableEntry; + PHANDLE_TABLE HandleTable; + PHANDLE_TABLE_ENTRY HandleTableEntry; + EXHANDLE Handle; ULONG Index = 0; NTSTATUS Status; PMDL Mdl; + PAGED_CODE(); DPRINT("NtQuerySystemInformation - SystemHandleInformation\n"); /* Set initial required buffer size */ - *ReqSize = sizeof(SYSTEM_HANDLE_INFORMATION); + *ReqSize = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION, Handles); /* Check user's buffer size */ if (Size < *ReqSize) @@ -1199,116 +1204,94 @@ return Status; } - _SEH2_TRY - { - PLIST_ENTRY NextTableEntry; - - /* Reset of count of handles */ - HandleInformation->NumberOfHandles = 0; - - /* Enumerate all system handles */ - for (NextTableEntry = HandleTableListHead.Flink; - NextTableEntry != &HandleTableListHead; - NextTableEntry = NextTableEntry->Flink) - { - PHANDLE_TABLE HandleTable; - - /* Enter a critical region */ - KeEnterCriticalRegion(); - - /* Acquire the handle table lock */ - ExAcquirePushLockExclusive(&HandleTableListLock); - - /* Get current handle table */ - HandleTable = CONTAINING_RECORD(NextTableEntry, HANDLE_TABLE, HandleTableList); - - _SEH2_TRY + /* Reset of count of handles */ + HandleInformation->NumberOfHandles = 0; + + /* Enter a critical region */ + KeEnterCriticalRegion(); + + /* Acquire the handle table lock */ + ExAcquirePushLockShared(&HandleTableListLock); + + /* Enumerate all system handles */ + for (NextTableEntry = HandleTableListHead.Flink; + NextTableEntry != &HandleTableListHead; + NextTableEntry = NextTableEntry->Flink) + { + /* Get current handle table */ + HandleTable = CONTAINING_RECORD(NextTableEntry, HANDLE_TABLE, HandleTableList); + + /* Set the initial value and loop the entries */ + Handle.Value = 0; + while ((HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, Handle))) + { + /* Validate the entry */ + if ((HandleTableEntry->Object) && + (HandleTableEntry->NextFreeTableEntry != -2)) { - PHANDLE_TABLE_ENTRY HandleTableEntry; - EXHANDLE Handle; - - /* Set the initial value and loop the entries */ - Handle.Value = 0; - while ((HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, Handle))) + /* Increase of count of handles */ + ++HandleInformation->NumberOfHandles; + + /* Lock the entry */ + if (ExpLockHandleTableEntry(HandleTable, HandleTableEntry)) { - /* Validate the entry */ - if ((HandleTableEntry->Object) && - (HandleTableEntry->NextFreeTableEntry != -2)) + /* Increase required buffer size */ + *ReqSize += sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO); + + /* Check user's buffer size */ + if (*ReqSize > Size) { - /* Increase of count of handles */ - ++HandleInformation->NumberOfHandles; - - /* Increase required buffer size */ - *ReqSize += sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO); - - /* Check user's buffer size */ - if (*ReqSize > Size) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - /* Lock the entry */ - if (ExpLockHandleTableEntry(HandleTable, HandleTableEntry)) - { - _SEH2_TRY - { - POBJECT_HEADER ObjectHeader = ObpGetHandleObject(HandleTableEntry); - - /* Filling handle information */ - HandleInformation->Handles[Index].UniqueProcessId = - (USHORT)(ULONG_PTR) HandleTable->UniqueProcessId; - - HandleInformation->Handles[Index].CreatorBackTraceIndex = 0; - - HandleInformation->Handles[Index].ObjectTypeIndex = - (UCHAR) ObjectHeader->Type->Index; - - HandleInformation->Handles[Index].HandleAttributes = - HandleTableEntry->ObAttributes & OBJ_HANDLE_ATTRIBUTES; - - HandleInformation->Handles[Index].HandleValue = - (USHORT)(ULONG_PTR) Handle.GenericHandleOverlay; - - HandleInformation->Handles[Index].Object = &ObjectHeader->Body; - - HandleInformation->Handles[Index].GrantedAccess = - HandleTableEntry->GrantedAccess; - - ++Index; - } - _SEH2_FINALLY - { - /* Unlock it */ - ExUnlockHandleTableEntry(HandleTable, HandleTableEntry); - } - _SEH2_END; - } + Status = STATUS_INFO_LENGTH_MISMATCH; } - - /* Go to the next entry */ - Handle.Value += sizeof(HANDLE); + else + { + POBJECT_HEADER ObjectHeader = ObpGetHandleObject(HandleTableEntry); + + /* Filling handle information */ + HandleInformation->Handles[Index].UniqueProcessId = + (USHORT)(ULONG_PTR) HandleTable->UniqueProcessId; + + HandleInformation->Handles[Index].CreatorBackTraceIndex = 0; + +#if 0 /* FIXME!!! Type field currupted */ + HandleInformation->Handles[Index].ObjectTypeIndex = + (UCHAR) ObjectHeader->Type->Index; +#else + HandleInformation->Handles[Index].ObjectTypeIndex = 0; +#endif + + HandleInformation->Handles[Index].HandleAttributes = + HandleTableEntry->ObAttributes & OBJ_HANDLE_ATTRIBUTES; + + HandleInformation->Handles[Index].HandleValue = + (USHORT)(ULONG_PTR) Handle.GenericHandleOverlay; + + HandleInformation->Handles[Index].Object = &ObjectHeader->Body; + + HandleInformation->Handles[Index].GrantedAccess = + HandleTableEntry->GrantedAccess; + + ++Index; + } + + /* Unlock it */ + ExUnlockHandleTableEntry(HandleTable, HandleTableEntry); } } - _SEH2_FINALLY - { - /* Release the lock */ - ExReleasePushLockExclusive(&HandleTableListLock); - - /* Leave the critical region */ - KeLeaveCriticalRegion(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) break; - } - } - _SEH2_FINALLY - { - /* Release the locked user buffer */ - ExUnlockUserBuffer(Mdl); - } - _SEH2_END; + + /* Go to the next entry */ + Handle.Value += sizeof(HANDLE); + } + } + + /* Release the lock */ + ExReleasePushLockShared(&HandleTableListLock); + + /* Leave the critical region */ + KeLeaveCriticalRegion(); + + /* Release the locked user buffer */ + ExUnlockUserBuffer(Mdl); return Status; }

8 years, 3 months

[aandrejevic] 72607: [VGADDI] Explain how VGA write mode 2 works. No code changes! CORE-8164

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Sep 7 14:38:58 2016 New Revision: 72607 URL: http://svn.reactos.org/svn/reactos?rev=72607&view=rev Log: [VGADDI] Explain how VGA write mode 2 works. No code changes! CORE-8164 Modified: trunk/reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.c Modified: trunk/reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.c [iso-8859-1] Wed Sep 7 14:38:58 2016 @@ -681,6 +681,19 @@ i += 8, off++; while (i < w) { + /* + * In write mode 2, the incoming data is 4-bit and represents the + * value of entire bytes on each of the 4 memory planes. First, VGA + * performs a logical operation on these bytes and the value of the + * latch register, but in this case there is none. Then, only the + * bits that are set in the bit mask are used from the resulting + * bytes, and the other bits are taken from the latch register. + * + * The latch register always contains the value previously read from + * VGA memory, and therefore, we must first read from vp[off] to + * load the latch register, and then write bp[i] to vp[off], which + * will be converted to 4 bytes of VGA memory as described. + */ dummy = vp[off]; dummy = bp[i]; vp[off] = dummy;

8 years, 3 months

[akhaldi] 72606: [CRT] Sync _cputs() with Wine Staging 1.9.16. CORE-11866 CORE-8546

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Sep 7 09:31:52 2016 New Revision: 72606 URL: http://svn.reactos.org/svn/reactos?rev=72606&view=rev Log: [CRT] Sync _cputs() with Wine Staging 1.9.16. CORE-11866 CORE-8546 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/lib/crt/conio/cputs.c 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] Wed Sep 7 09:31:52 2016 @@ -287,6 +287,7 @@ reactos/dll/win32/kernel32/winnls/string/sortkey.c # Synced to WineStaging-1.9.16 msvcrt - + reactos/sdk/lib/crt/conio/cputs.c # Synced to WineStaging-1.9.16 reactos/sdk/lib/crt/except/cpp.c # Synced at 20080528 reactos/sdk/lib/crt/except/cppexcept.c # Synced at 20071111 reactos/sdk/lib/crt/process/_cwait.c # Synced to WineStaging-1.7.37 Modified: trunk/reactos/sdk/lib/crt/conio/cputs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/conio/cputs.c?… ============================================================================== --- trunk/reactos/sdk/lib/crt/conio/cputs.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/conio/cputs.c [iso-8859-1] Wed Sep 7 09:31:52 2016 @@ -1,26 +1,29 @@ -/* - * COPYRIGHT: LGPL - See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/sdk/crt/conio/cputs.c - * PURPOSE: Writes a character to stdout - * PROGRAMER: Aleksey Bragin - */ +/* Imported from msvcrt/console.c */ #include <precomp.h> -/* - * @implemented +/********************************************************************* + * _cputs (MSVCRT.@) */ -int _cputs(const char *_str) +int CDECL _cputs(const char* str) { DWORD count; - int retval = EOF; - HANDLE console_out = GetStdHandle(STD_OUTPUT_HANDLE); + int len, retval = -1; +#ifdef __REACTOS__ /* r54651 */ + HANDLE MSVCRT_console_out = GetStdHandle(STD_OUTPUT_HANDLE); +#endif - //LOCK_CONSOLE; - if (WriteConsoleA(console_out, _str, strlen(_str), &count, NULL) - && count == 1) + if (!MSVCRT_CHECK_PMT(str != NULL)) return -1; + len = strlen(str); + +#ifndef __REACTOS__ /* r54651 */ + LOCK_CONSOLE; +#endif + if (WriteConsoleA(MSVCRT_console_out, str, len, &count, NULL) + && count == len) retval = 0; - //UNLOCK_CONSOLE; +#ifndef __REACTOS__ /* r54651 */ + UNLOCK_CONSOLE; +#endif return retval; }

8 years, 3 months

[jimtabor] 72605: [Win32k] - Fix a crash while running modified stress test with explorer. See CORE-11913.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Sep 7 06:33:44 2016 New Revision: 72605 URL: http://svn.reactos.org/svn/reactos?rev=72605&view=rev Log: [Win32k] - Fix a crash while running modified stress test with explorer. See CORE-11913. Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Wed Sep 7 06:33:44 2016 @@ -4137,9 +4137,12 @@ if (mt.TopMenu->fFlags & MNF_POPUP) { PWND pwndTM = ValidateHwndNoErr(mt.TopMenu->hWnd); - IntNotifyWinEvent(EVENT_SYSTEM_MENUPOPUPEND, pwndTM, OBJID_CLIENT, CHILDID_SELF, 0); - - co_UserDestroyWindow(pwndTM); + if (pwndTM) + { + IntNotifyWinEvent(EVENT_SYSTEM_MENUPOPUPEND, pwndTM, OBJID_CLIENT, CHILDID_SELF, 0); + + co_UserDestroyWindow(pwndTM); + } mt.TopMenu->hWnd = NULL; if (!(wFlags & TPM_NONOTIFY))

8 years, 3 months

[jimtabor] 72604: [NtGdi] - Remove Path for MoveTo and Polyline. It is not needed. - Fix build.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Sep 7 03:24:12 2016 New Revision: 72604 URL: http://svn.reactos.org/svn/reactos?rev=72604&view=rev Log: [NtGdi] - Remove Path for MoveTo and Polyline. It is not needed. - Fix build. Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] Wed Sep 7 03:24:12 2016 @@ -1702,7 +1702,7 @@ POINT pt; IntGetCurrentPositionEx(dc, &pt); IntDPtoLP(dc, &pt, 1); - IntGdiMoveToEx(dc, pt.x, pt.y, NULL, FALSE); + IntGdiMoveToEx(dc, pt.x, pt.y, NULL); } DPRINT("Leave %s, ret=%d\n", __FUNCTION__, ret); return ret;

8 years, 3 months

[jimtabor] 72603: [NtGdi] - Remove Path for MoveTo. It is not needed.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Sep 7 03:20:18 2016 New Revision: 72603 URL: http://svn.reactos.org/svn/reactos?rev=72603&view=rev Log: [NtGdi] - Remove Path for MoveTo. It is not needed. Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c trunk/reactos/win32ss/gdi/ntgdi/intgdi.h trunk/reactos/win32ss/gdi/ntgdi/line.c trunk/reactos/win32ss/gdi/ntgdi/path.h Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/arc.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] Wed Sep 7 03:20:18 2016 @@ -238,9 +238,9 @@ if (arctype == GdiTypeArcTo) { if (dc->dclevel.flPath & DCPATH_CLOCKWISE) - IntGdiMoveToEx(dc, XStartArc, YStartArc, NULL, TRUE); + IntGdiMoveToEx(dc, XStartArc, YStartArc, NULL); else - IntGdiMoveToEx(dc, XEndArc, YEndArc, NULL, TRUE); + IntGdiMoveToEx(dc, XEndArc, YEndArc, NULL); } return Ret; } @@ -285,7 +285,7 @@ if (result) { - IntGdiMoveToEx(pDC, x2, y2, NULL, TRUE); + IntGdiMoveToEx(pDC, x2, y2, NULL); } return result; } Modified: trunk/reactos/win32ss/gdi/ntgdi/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/intgdi.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] Wed Sep 7 03:20:18 2016 @@ -25,8 +25,7 @@ IntGdiMoveToEx(DC *dc, int X, int Y, - LPPOINT Point, - BOOL BypassPath); + LPPOINT Point); BOOL FASTCALL IntGdiPolyBezier(DC *dc, Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Wed Sep 7 03:20:18 2016 @@ -19,10 +19,8 @@ IntGdiMoveToEx(DC *dc, int X, int Y, - LPPOINT Point, - BOOL BypassPath) -{ - BOOL PathIsOpen; + LPPOINT Point) +{ PDC_ATTR pdcattr = dc->pdcattr; if ( Point ) { @@ -43,13 +41,6 @@ pdcattr->ptfxCurrent = pdcattr->ptlCurrent; CoordLPtoDP(dc, &pdcattr->ptfxCurrent); // Update fx pdcattr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE); - - if (BypassPath) return TRUE; - - PathIsOpen = PATH_IsPathOpen(dc->dclevel); - - if ( PathIsOpen ) - return PATH_MoveTo ( dc ); return TRUE; } @@ -67,7 +58,7 @@ EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } - Ret = IntGdiMoveToEx(dc, x, y, pptOut, TRUE); + Ret = IntGdiMoveToEx(dc, x, y, pptOut); DC_UnlockDc(dc); return Ret; } @@ -108,16 +99,6 @@ if (PATH_IsPathOpen(dc->dclevel)) { Ret = PATH_LineTo(dc, XEnd, YEnd); - if (Ret) - { - // FIXME: PATH_LineTo should maybe do this? No - pdcattr->ptlCurrent.x = XEnd; - pdcattr->ptlCurrent.y = YEnd; - pdcattr->ptfxCurrent = pdcattr->ptlCurrent; - CoordLPtoDP(dc, &pdcattr->ptfxCurrent); // Update fx - pdcattr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE); - } - return Ret; } else { @@ -257,9 +238,6 @@ return FALSE; } - if (PATH_IsPathOpen(dc->dclevel)) - return PATH_Polyline(dc, pt, Count); - DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); psurf = dc->dclevel.pSurface; @@ -355,8 +333,9 @@ pc = PolyPoints; if (PATH_IsPathOpen(dc->dclevel)) + { return PATH_PolyPolyline( dc, pt, PolyPoints, Count ); - + } for (i = 0; i < Count; i++) { ret = IntGdiPolyline ( dc, pts, *pc ); @@ -544,7 +523,7 @@ } if (num_pts >= 2) IntGdiPolyline( dc, line_pts, num_pts ); - IntGdiMoveToEx( dc, line_pts[num_pts - 1].x, line_pts[num_pts - 1].y, NULL, TRUE ); + IntGdiMoveToEx( dc, line_pts[num_pts - 1].x, line_pts[num_pts - 1].y, NULL ); result = TRUE; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -592,7 +571,7 @@ pdc = DC_LockDc(hdc); if (!pdc) return FALSE; - Ret = IntGdiMoveToEx(pdc, x, y, &Point, TRUE); + Ret = IntGdiMoveToEx(pdc, x, y, &Point); if (Ret && pptOut) { Modified: trunk/reactos/win32ss/gdi/ntgdi/path.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.h [iso-8859-1] Wed Sep 7 03:20:18 2016 @@ -54,7 +54,6 @@ BOOL FASTCALL PATH_Ellipse (PDC dc, INT x1, INT y1, INT x2, INT y2); VOID FASTCALL PATH_EmptyPath (PPATH pPath); BOOL FASTCALL PATH_LineTo (PDC dc, INT x, INT y); -BOOL FASTCALL PATH_MoveTo (PDC dc); BOOL FASTCALL PATH_PolyBezier (PDC dc, const POINT *pts, DWORD cbPoints); BOOL FASTCALL PATH_PolyBezierTo (PDC dc, const POINT *pts, DWORD cbPoints); BOOL FASTCALL PATH_PolyDraw(PDC dc, const POINT *pts, const BYTE *types, DWORD cbPoints);

8 years, 3 months

[aandrejevic] 72602: [PSDK] Add a definition for KsReleaseDevice to ks.h.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Sep 7 01:16:47 2016 New Revision: 72602 URL: http://svn.reactos.org/svn/reactos?rev=72602&view=rev Log: [PSDK] Add a definition for KsReleaseDevice to ks.h. Modified: trunk/reactos/sdk/include/psdk/ks.h Modified: trunk/reactos/sdk/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ks.h?rev=… ============================================================================== --- trunk/reactos/sdk/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ks.h [iso-8859-1] Wed Sep 7 01:16:47 2016 @@ -4117,6 +4117,13 @@ KSDDKAPI VOID NTAPI +KsReleaseDevice( + _In_ PKSDEVICE); + +_IRQL_requires_max_(DISPATCH_LEVEL) +KSDDKAPI +VOID +NTAPI KsReleaseIrpOnCancelableQueue( _In_ PIRP Irp, _In_opt_ PDRIVER_CANCEL DriverCancel);

8 years, 3 months

[gedmurphy] 72601: [PSDK] - Add flt error codes to winerror.h

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Sep 6 20:53:43 2016 New Revision: 72601 URL: http://svn.reactos.org/svn/reactos?rev=72601&view=rev Log: [PSDK] - Add flt error codes to winerror.h Modified: trunk/reactos/sdk/include/psdk/winerror.h Modified: trunk/reactos/sdk/include/psdk/winerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winerror.… ============================================================================== --- trunk/reactos/sdk/include/psdk/winerror.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winerror.h [iso-8859-1] Tue Sep 6 20:53:43 2016 @@ -3271,4 +3271,41 @@ #define ERROR_AUDITING_DISABLED _HRESULT_TYPEDEF_(0xC0090001L) #define ERROR_ALL_SIDS_FILTERED _HRESULT_TYPEDEF_(0xC0090002L) + +#define FILTER_HRESULT_FROM_FLT_NTSTATUS(x) (ASSERT((x & 0xfff0000) == 0x001c0000), \ + (HRESULT)(((x) & 0x8000FFFF) | (FACILITY_USERMODE_FILTER_MANAGER << 16))) + +#define ERROR_FLT_IO_COMPLETE _HRESULT_TYPEDEF_(0x001F0001L) +#define ERROR_FLT_NO_HANDLER_DEFINED _HRESULT_TYPEDEF_(0x801F0001L) +#define ERROR_FLT_CONTEXT_ALREADY_DEFINED _HRESULT_TYPEDEF_(0x801F0002L) +#define ERROR_FLT_INVALID_ASYNCHRONOUS_REQUEST _HRESULT_TYPEDEF_(0x801F0003L) +#define ERROR_FLT_DISALLOW_FAST_IO _HRESULT_TYPEDEF_(0x801F0004L) +#define ERROR_FLT_INVALID_NAME_REQUEST _HRESULT_TYPEDEF_(0x801F0005L) +#define ERROR_FLT_NOT_SAFE_TO_POST_OPERATION _HRESULT_TYPEDEF_(0x801F0006L) +#define ERROR_FLT_NOT_INITIALIZED _HRESULT_TYPEDEF_(0x801F0007L) +#define ERROR_FLT_FILTER_NOT_READY _HRESULT_TYPEDEF_(0x801F0008L) +#define ERROR_FLT_POST_OPERATION_CLEANUP _HRESULT_TYPEDEF_(0x801F0009L) +#define ERROR_FLT_INTERNAL_ERROR _HRESULT_TYPEDEF_(0x801F000AL) +#define ERROR_FLT_DELETING_OBJECT _HRESULT_TYPEDEF_(0x801F000BL) +#define ERROR_FLT_MUST_BE_NONPAGED_POOL _HRESULT_TYPEDEF_(0x801F000CL) +#define ERROR_FLT_DUPLICATE_ENTRY _HRESULT_TYPEDEF_(0x801F000DL) +#define ERROR_FLT_CBDQ_DISABLED _HRESULT_TYPEDEF_(0x801F000EL) +#define ERROR_FLT_DO_NOT_ATTACH _HRESULT_TYPEDEF_(0x801F000FL) +#define ERROR_FLT_DO_NOT_DETACH _HRESULT_TYPEDEF_(0x801F0010L) +#define ERROR_FLT_INSTANCE_ALTITUDE_COLLISION _HRESULT_TYPEDEF_(0x801F0011L) +#define ERROR_FLT_INSTANCE_NAME_COLLISION _HRESULT_TYPEDEF_(0x801F0012L) +#define ERROR_FLT_FILTER_NOT_FOUND _HRESULT_TYPEDEF_(0x801F0013L) +#define ERROR_FLT_VOLUME_NOT_FOUND _HRESULT_TYPEDEF_(0x801F0014L) +#define ERROR_FLT_INSTANCE_NOT_FOUND _HRESULT_TYPEDEF_(0x801F0015L) +#define ERROR_FLT_CONTEXT_ALLOCATION_NOT_FOUND _HRESULT_TYPEDEF_(0x801F0016L) +#define ERROR_FLT_INVALID_CONTEXT_REGISTRATION _HRESULT_TYPEDEF_(0x801F0017L) +#define ERROR_FLT_NAME_CACHE_MISS _HRESULT_TYPEDEF_(0x801F0018L) +#define ERROR_FLT_NO_DEVICE_OBJECT _HRESULT_TYPEDEF_(0x801F0019L) +#define ERROR_FLT_VOLUME_ALREADY_MOUNTED _HRESULT_TYPEDEF_(0x801F001AL) +#define ERROR_FLT_ALREADY_ENLISTED _HRESULT_TYPEDEF_(0x801F001BL) +#define ERROR_FLT_CONTEXT_ALREADY_LINKED _HRESULT_TYPEDEF_(0x801F001CL) +#define ERROR_FLT_NO_WAITER_FOR_REPLY _HRESULT_TYPEDEF_(0x801F0020L) +#define ERROR_FLT_REGISTRATION_BUSY _HRESULT_TYPEDEF_(0x801F0023L) + + #endif /* __WINE_WINERROR_H */

8 years, 3 months

← Newer
1
...
24
25
26
27
28
29
30
...
35
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 September 2016